Merge branch 'develop' into 'master'

Develop
Merge pull request #6 from robotice/master

 Merge branch 'develop' into 'master'