redoing a lost a commit from a past merge confict
Merge pull request #325 from thongsav-usgs/master

redoing a lost a commit from a past merge confict