Merge Fixes
Merge branch 'master' of https://github.com/zaclolz/T4