resolved merge-conflicts
Merge branch 'master' of https://github.com/axelniklasson/blue-java