Develop

Merge in preparation for v0.2