Merge pull request #58 from ggear/master

Upgrade to CM5..0.2