Added command line -i support