Merge pull request #2 from FireArrow/master

Pull before multithreading destroys everything