Prepared some things for later development
Small namespace fix
Another small namespace fix
Merge pull request #13 from wvanbreukelen/testing

Testing