Merge pull request #1 from distantcam/master

Completed functionality from Haacked/NullGuard
Merge pull request #2 from distantcam/master

Fixed tests to run when multi-threaded.
fix typeof imports