dia update
Merge branch 'master' of https://github.com/adamskopl/cubicforest-java