Merge pull request #33 from cschroed-usgs/master

Revert "Revert "Merge pull request #31 from cschroed-usgs/NAWQAAN-39""
Merge pull request #34 from cschroed-usgs/master

Corrected for case with no resulting features.