Merge branch 'master' of https://github.com/cortetj/JSimForest.git