Merge pull request #1 from maxvetrenko/fixTravisBuild

Fix build
Fix travis oracle jdk 7 build