closes v0.0.6