Fixing #3, renaming namespace and class