Improved the code and the documentation
Improved code and documentation