Fixed the GUI to work properly with threads
Merge branch 'master' of https://github.com/OSCAAR/OSCAAR