Merge pull request #23 from ipri2013/master

Sync preostalih stvari
PEP8 malenkost

PEP8 1 vrstica
Merge pull request #88 from zigaemersic/master

PEP8 malenkost