Merge pull request #44 from rampo/master

Develop to master