Removed threading because of low usage (working now back also on mac osx / win)