Merge pull request #48 from psichi/master

erhm..
Merge pull request #49 from psichi/develop

Merge pull request #48 from psichi/master