[WIP]
[MERGE] after
Merge branch 'master' of https://github.com/markubik/SAG-GUI
[DONE]