Merge pull request #20 from wigyori/master