Adding the task from Green Belt
Merge branch 'master' of https://github.com/Crash-ID/bogomil_kolarov_tues