Merge pull request #851 from aesnyder/aes/remove-namespace

Aes/remove namespace
remove namespace
retab