Merge pull request #38 from salithus/develop

Develop