update namespace foo, cleanup
Merge pull request #13 from bmoyles/master

Fixes for aminator #158 and #159