fixed lab1 1.5 and 1.7
Merge pull request #22 from lewenhagen/master

fixed lab1 1.5 and 1.7