ttt
Merge pull request #28 from filiprozanski/filip

merge 12.08.2014