Merge pull request #12 from timxx/dev

Dev
Merge pull request #14 from timxx/dev

wrongly merge commit?
Merge pull request #15 from timxx/dev

Dev
Update README.md
Merge pull request #16 from timxx/master

pull master