Add some tests
Update README.md
Merge branch 'develop'