incorporated last commit from GEOWAVE-75-Opt
Merge pull request #98 from ngageoint/GEOWAVE-95

incorporated last commit from GEOWAVE-75-Opt