Merge pull request #61 from wigyori/master