Cleaned up NAMESPACE and add default method to mat