Merge pull request #1 from subtub/develop

merge develop into master
Update README.md
make test
Merge pull request #2 from subtub/master

update develop branch