Test Travis-CI and Maven
Minor changes
Merge remote-tracking branch 'origin/master'