Final of 0.0.1 before 0.1.0 upversioning for helios branch
Merge branch 'develop' into helios