SGCraft support fixes #60 fixes #24