Merge pull request #44 from rampo/master

Develop to master
Merge pull request #45 from rampo/develop

Merge pull request #44 from rampo/master