* Fix all errors of refactored code
* Added better documentation to README file