merging in changes from v0.2.0 branch