GUI
Merge branch 'master' of https://github.com/AlexPauls/e_f.git