Kind of functional part 2
Merge branch 'master' of https://github.com/zortok/INF3610