Merge pull request #51 from nejc92/master

minor changes
Merge pull request #52 from nejc92/master

putting things together
Update cakalnica.
Merge pull request #53 from juree/master

update cakalnica.
Merge pull request #7 from ipri2013/master

Updating my fork