Added support for executables and some command line options