Better ordinal handling
README.md update
Namespace and naming improvements