Merge develop into master

Dom Sekotillrequested to merge
develop into master

Closes #11 (closed) and #14 (closed)

Edited by Dom Sekotill

Merge request reports