Worked on CAH_Users mainly
Merge pull request #209 from HoltMaki/master

Worked on CAH_Users mainly