Tidy Up + Bug Fixes
Merge pull request #7 from cts12/feature/simon

Tidy Up + Bug Fixes