switched to development branch
Merge remote-tracking branch 'origin/v0.1.1-devel' into v0.1.1-devel