Addressing  regressions and review comments
Merge pull request #160 from sharadkjaiswal/Namespace

Addressing  regressions and review comments