Mack's modifications
Merge branch 'master' of https://github.com/JemyDev/tchome2