Merge pull request #10 from drdangersimon/develop

Develop
some cleanup. Think there was tabs and spaces mixed, wouldn't run