Code and Readme updated