Branch 'taskomatic' - 4 commits - java/code