bug fixed in java8
Merge remote-tracking branch 'origin/master'