Merge branch 'release/0.2.0'
Correct naming
Merge remote-tracking branch 'origin/pr/35' into develop. Refs #35, #36.