Indentation fix
Changes to try and merge
Merge pull request #27 from emsiepopples/master

Amalgamated a few functions and edits to reflect this