Actually tidy up the right thing this time
Merge pull request #68 from dreamteam69/master

Actually tidy up the right thing this time