attempt to fix the weird hangs
Merge branch 'master' of github.com:RouxRC/gazouilleur