Merge pull request #41 from jordandukart/7.x

Use the allowed namespace utility functions.
Minor fixes.