Updates to library, preparing for v0.2.0