Merged Changes from 2.0.0.1

Changed ISO variables to *.iso to allow for selection of any ISO this
may break exe