added flags
Merge branch 'development' of https://github.com/opentox/opentox-test into development