Attempting fix from jgor
Merge branch 'master' of https://github.com/JonValt/ratigan.git