stand alone executables
Fixed merge conflicts
stand alone executables