Merge pull request #85 from Naios/master

some Shannox Updates (Crashfix)