Merge pull request #38 from salithus/develop

Develop
Merge pull request #39 from salithus/master

Merge pull request #38 from salithus/develop