Fixed Event Listener Order
Merge pull request #200 from wshafer/master

Fixed Event Listener Order