consolidated 0.0.4 and 0.0.5 fixes
v0.0.6