Namespace fix
Merge pull request #8 from guardianproject/npex_work

Namespace fix
Merge remote-tracking branch 'origin/master' into paik