improve sample load
improve setup models
Merge pull request #60 from openjaf/feature/task_setup

Improve setup models