Move async events to the actual extension and fix exception.
Fix indentation and line ending.
Merge pull request #891 from RobertBColton/master

Asynchronous Extension Fixes