Improved code
Updated README