Merge pull request #25 from nolanfilter/Nolan

Added zoom events