Trying to make it work with jdk7
Merge origin/master