Improve main window resizing. Fixes #133
Merge pull request #138 from mgmax/develop

Improve main window resizing. Fixes #133