tests pass now
Merge pull request #132 from jkreft-usgs/master

tests pass now