! housekeeping
Merge pull request #23 from Spuds/master

Housekeeping part 1