Removed Namespacing in reference to #2