merged v2
Merge branch 'master' of https://github.com/WSULib/DCAPI