cleanup
Merge branch 'command-line-parser' of github.com:gjvc/commander into command-line-parser