Some fixes for Exercise 2, Part 3.
Merge pull request #261 from ugisozols/fixes

Some fixes for Exercise 2, Part 3.