bugfix-#197 done
Merge remote-tracking branch 'origin/bugfix-#197' into release-0.2.0