Merge pull request #269 from hazendaz/master

More Sonar Corrections and Java 6 support