Merge pull request #50 from rampo/develop

Merge pull request #49 from rampo/master
Merge pull request #51 from rampo/master

Merge pull request #50 from rampo/develop