Issue 21

This would merge fixes to/work on #21 and #22 . However, #12 might still need some attention before being closed and #21 is not actually fixed but a similar issue has been attended to (the app now quits when the window is closed without pressing the quit button first). When we have decided on what to do about #12 this should be merged into master.