Merge branch 'develop'
Updated version number to 1.0.1