Testing the changes from Samian to fix the Windows crash bug
Merge pull request #138 from fly-man-/aurora-win-issues

Testing the changes from Samian to fix the Windows crash bug
Merge remote-tracking branch 'upstream/master'