patch for bugs #109 (issues with zooming) and #110 (issues with adding new states)
Merge remote-tracking branch 'origin/beta' into alpha