Merge pull request #26 from psichi/develop

Develop