Updated README and minor bugfix