Added dispose eventhandler.  Commit and push only changed lines.