latest changes from PNNL
Merge branch 'master' of github.com:SCI-Utah/cnome