Arguments dev

Merged Ghost User requested to merge arguments-dev into master

Complete rewrite and addition of features.

Merge request reports