merge in v0.2.1 bugfix