Merge pull request #105 from fatchicken007/master

Add features and fix bugs
Update README.md