Merge branch 'develop'
Bump to version to 0.1.1
Merge branch 'master' into develop