Merge branch 'develop'
Prepare 0.1.1 release
Minor fix