Merge branch 'release/0.1.0' into develop
Fix white space.
Sort out licensing comments.
Merge branch 'develop'