NAWQAAN-205

* Final commit on this, test have been added
* Also incorporated suggestions from code review
Merge pull request #182 from jiwalker-usgs/NAWQAAN-205

NAWQAAN-205