small bugfix
Add badges in readme
Merge pull request #56 from PeterDaveHello/patch-5

Add badges in readme
fix the tests
Update .travis.yml
Update package.json
Merge branch 'master' into gh-pages