Merge pull request #51 from rampo/master

Merge pull request #50 from rampo/develop
Merge pull request #52 from rampo/develop

Merge pull request #51 from rampo/master