Added command line options (-q, -f)