Fix Issue #118
Merge branch 'master' of https://github.com/GMous/ProjectRed