Fixed #95, commented out closing of overlay
Merge branch 'bugfix/95' into develop