Fixed #1 & Fixed README.md