Fixed #240 and #238
Merge branch 'master' of https://github.com/pixlepix/ThaumicTinkerer