Fix switching between views. Fixes #18
Fix switching between views. Fixes #18
Rebase off of master
merge
Rebuild
Merging zoom-fix-18 into master to fix infinite zooming bug