Merge pull request #15 from cschroed-usgs/WATERSMART-234

Watersmart 234
Merge pull request #16 from cschroed-usgs/WATERSMART-234

Watersmart 234 and also Watersmart 210