Class 3 changes
Merge branch 'master' of https://github.com/saralevy/ccaejs