Feature/prep for release 0.2.1

Preparing for Release 0.2.1. 

Merging changes from develop into release/0.2.0 branch (plus the version the change from 0.3.0-SNAPSHOT to 0.2.1)