fixing up threading
Merge branch 'master' of ssh://github.com/jewmanchue/wham