Merge pull request #85 from Naios/master

some Shannox Updates (Crashfix)
Merge pull request #1 from Ayane/master

Merge pull request #85 from Naios/master