incorporated last commit from GEOWAVE-75-Opt