Added support for changing program options