v0.2 push; fixes #03 fixes #04 fixes #06