Use utility function to accomplish namespace restrictions.
Merge pull request #65 from jordandukart/7.x

Use utility function to accomplish namespace restrictions.