Changes in prep for v0.0.2