Converts to docopt.
Tweaks docopt.
Merge branch 'feature/11' into development