Final commit from Desktop
Merge branch 'master' of https://github.com/RemekGdansk/HFO-OAaD.git
Merge branch 'master' of https://github.com/RemekGdansk/HFO-OAaD.git
From desktop