Improved documentation
Improved tests