Changes made by Doug Preston (dgprstn@outlook.com).
Merge branch 'master' of https://github.com/Codzart/RiMo.git