Added the use of namespaces so we can be more OOP about this
Merge pull request #10 from hazardfn/OOP-me

Oop me