namespace changes
Merge pull request #23 from simonlynen/namespace_changes

namespace changes