Merge pull request #2 from mikedugan/master

a few updates
fix naespacing