Documentation has been updated and some methods has been improved