Fixed #225 it was two issues in one
Merge branch 'master' of https://github.com/pixlepix/ThaumicTinkerer