Good inherit of event machine with some magic
more fixes in event machine
Merge remote-tracking branch 'origin/master'