Release v0.2.1
 Merge into master
 Increased version for development