Merge pull request #1 from ProjectOpenCannibal/58eef6b56ae987df0fd220ab5751a967d9a1fa7c

Testing CM compatible version of branch versus OG branch.
Merge pull request #2 from ProjectOpenCannibal/master

Pull request #2