Merge pull request #95 from engineyard/CC-385