H/W 3 fix merge

https://github.com/pioneerit/teta/milestones/HW3