Added command line switch to enable/disable image support