Merge from Moritz branch. Clean-up is still needed.

Refactor argument parsing + New commands

(0) -10 -2 +2 +10 +30 tip

mercurial