Merge pull request #619 from davidmsibley/cidaUsers