Support more flexible commands
Merge branch 'master' of https://github.com/dariusriggins/robusticus