Merge pull request #59 from rokkolesa/master

Merge pull request #12 from zapiski/master
Merge pull request #60 from rokkolesa/master

Popravki za upload
Merge pull request #13 from zapiski/master

asdf