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

This reverts commit a2fbbbde9ae75a17327cd712d150fd0a873e2052.
Merge pull request #33 from cschroed-usgs/master

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