Merge pull request #1 from trevorsmith86/master

Modified the README
javadoc n such
Merge pull request #2 from robertzas/master

javadoc n such
changed readme test
Merge pull request #3 from elmutt/master

changed readme test
Update .travis.yml
Resolve merge conflicts for stronger typing