now properly parsing the options list of each command - fixes #369