Merge pull request #11 from zapiski/master

Baza