Merge branch 'develop'
Fixed typo
Merge pull request #2 from robinbijlani/master

Fixed typo
Merge branch 'develop'
fixed merge conflict, fixed typo
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
updated public script
Merge branch 'master' into develop