Made example-ae work again
Call aeStop on error conditions
Merge branch 'example-ae'