pcmanus/ccm — pull request #190 by ptnapoleon (2014-10-20 16:56:39+00:00)
Title: Squashed commit of the following:

Fixes #181