0.2.0 2

Merge into master, in preparation for version upgrade