Merge pull request #8 from Lich2013/master

fix conflict
Update README.md
Merge pull request #9 from Lich2013/dev

Dev