minor fixes for 0.1.0
Merge branch 'develop'