Merge pull request #21 from sichinumi/master

Merged dustsnow and webs961's changes