finished lab 5
some fixes
Merge pull request #71 from lewenhagen/master

some fixes