Merge pull request #49 from psichi/develop

Merge pull request #48 from psichi/master
Merge pull request #54 from psichi/develop

Develop
Merge pull request #55 from psichi/develop

remove
Merge pull request #56 from psichi/master

Erhm..