Update
Merge branch 'master' of https://github.com/tomazsustar/zelnik3.0