Merge pull request #8 from Rukenshia/dev_untested

Crashfix, CFaction