added namespacing for issue #76