Merge pull request #24 from nolanfilter/Allen

Allen
Added zoom events
Merge pull request #25 from nolanfilter/Nolan

Added zoom events