fixes bonus 2 and testing
fixes bonus 2 and testing + documentation
DOcu
Merge remote-tracking branch 'origin/Marek'