Improved code
Improved README.md