major fix
mega mergeMerge branch 'master' of https://github.cog/GhostProf/REM