Some minor code formatting and refactoring.
Merge branch 'master' into develop; well, that went wrong…
Push version number to 0.2.0