Merge pull request #59 from ggear/master

Update for CM5.1 / CDH5.1