Fixes #1
Merge branch 'master' of https://github.com/tuwiendsg/DaaSM2M