Cleanup from previous commit
Merge branch 'master' of https://github.com/RavetcoFX/Cinnamon
Merge branch 'master' of https://github.com/RavetcoFX/Cinnamon