Added command-line options, fixes #1