bugfix
Merge branch 'master' into v0.2

* master:
  bugfix