Develop

Merging in this minor release 0.2.0