Fixed up some comments
Merge branch 'release/0.1' into develop