Namespaced the library
Merge conflict