further fixing merge conflict.
Merge pull request #80 from dblodgett-usgs/master

further fixing merge conflict.