Some tidying and commenting of the code.
Merge branch 'release/v0.3.0' into develop