A couple changes as suggested by Ivan
Merge pull request #37 from jiwalker-usgs/master

A couple changes as suggested by Ivan