Add command-line options. Fixes issue #2