merged branch from https://github.com/shawnma/Apollo-CM.git