modified body
Merge branch 'dev' of https://github.com/Miljaker/2easy into dev