FIXING DEM ERRORS

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Merge branch 'master' of https://github.com/Jasera/SoftwareDevelopment