Fixed crash #225
Merge branch 'master' into 1.6.4
Updating so CP can check status
Merge branch '1.6.4' of https://github.com/CrazyPants/EnderIO into 1.6.4