removed multithreading
Merge branch 'master' into multithreaded