Merge pull request #1 from makotok/master

Merge pull request #103 from alex1line/master