Updated NAMESPACE (Issue#3)