zoomtomessage
Merge pull request #6 from tomvantilburg/master

merge toms work
Merge pull request #6 from stvno/master

merge steven