Merge pull request #57 from psichi/develop

Merge pull request #56 from psichi/master