Merge pull request #195 from krakjoe/master

removal of thread safety