Merge pull request #37 from wigyori/master