Merge branch 'master' into develop
Small style changes (mainly to the way some variables were named.
Merge branch 'styling' into develop
Version bump to 0.1.1
Merge branch 'version-0.1.1'