change back to merge
Merge pull request #38 from schristel-USGS/master

change back to merge