fix critical error
Merge pull request #1 from atomicfaster/criticalerror

Criticalerror
Merge pull request #2 from atomicfaster/master

merge master