- introduced namespacing: issue #2