Task 2.5 and Task 2.2.2 bug fix
Merge branch 'master' of https://github.com/timo-piirmann/umbluu.git