Merge branch 'master' of https://github.com/sGuid/Red-Hatter