Merge pull request #11 from zapiski/master

Baza
Merge pull request #57 from rokkolesa/master

Merge pull request #11 from zapiski/master