Finished task 4.3
Fixed merge conflicts
Merge pull request #24 from buren/task4.3

Task4.3