Threading better
Merge branch 'master' of https://github.com/tubs/harmony