Fix the Calcinators gui name
Merge remote-tracking branch 'origin/master'