8 verbs not 5, options not option
Merge pull request #525 from nmpolo/master

8 verbs not 5, options not option