#161 

current java version upgrade.
Merge pull request #162 from wimjongman/master

#161
We are really going for java 1.7 :-)