Zadane 2
Merge pull request #238 from KWisniewski/master

Zadane 2