Moar namespacey goodness
Merge pull request #188 from UniversityRadioYork/expection

Moar namespacey goodness