Merge pull request #25 from wigyori/master