Fixed -C option to work on command line. Bug #16.