Merge pull request #50 from juree/master

Cakalnica almost done.
Merge pull request #6 from ipri2013/master

Updating my fork
minor changes
Merge pull request #51 from nejc92/master

minor changes
Merge pull request #1 from ipri2013/master

Minor changes.