Merge branch 'devel'
Release v0.1.1
Merge branch 'master' into devel