Fixed waiting
Merge https://github.com/davidwoody/teachme