Added command line options to override settings, closes #1