Merge pull request #27 from wshafer/master

Fixed Event Listener Order