more on lab5
Merge pull request #69 from lewenhagen/master

more on lab5