Merge pull request #2 from ecjs/master

dev
some changes for better testing
add tests
Update README.md
Merge pull request #3 from ecjs/dev

Dev