minor tweaks
Merge pull request #7 from waldir/patch-1

Minor changes in README
Merge pull request #8 from porras/tests

Basic acceptance test
Merge branch 'master' into travis