Merge pull request #15 from Bkahler/master

rearranged zoom and information window functions