Merge pull request #1 from CollegeDev/cm10.1

Merge pull request #6 from Triturus/patch-1