update command-line options
Merge branch 'master' of github.com:hexhex/core