Version 0.2.1 for helios
Merge branch 'develop' into helios for 0.2.1 release