Updated version
Updated documentation and test