Merge pull request #1 from zelgerj/master

initial commit
Merge pull request #2 from zelgerj/master

corrected namespace