Namespace changed
merging to update package name
Merge fixes