house-keeping.
Merge branch 'master' of https://github.com/ktaylora/CAM