update 20140602
Merge branch 'master' of https://github.com/henkvos/m24