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