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

This restores feature NAWQAAN-39 by reverting commit a2fbbbde9ae75a17327cd712d150fd0a873e2052.