Merge pull request #58 from psichi/master

Merge pull request #57 from psichi/develop
Merge pull request #59 from psichi/develop

Merge pull request #58 from psichi/master