changed namespacing to fix clang bug
Merge pull request #190 from Astron/bugfix/clang-fix-constraints

changed namespacing to fix clang bug