Merge pull request #15 from chrishaid/master

Fixed NAMESPACE. Again.