Merge develop into master - 0.9.2

 Zoom work. Closes #19