simplify the command-line api
Merge pull request #403 from nicks/nick-cli2

simplify the command-line api