Ispravka buga #34
Merge branch 'master' of https://github.com/ssuljic/SI2013Tim12