Issue #2 WIP
Merge remote-tracking branch 'origin/master' into master_java8