#65 changes for v0.0.6 release