Fix for disappearing highlight markers and save interface.
Merge branch 'master' of https://github.com/tibi22/MasterThesis