more context around help and options
Merge branch 'master' of github.com:datascopeanalytics/dix
comments
fixed conflicts