grger

greg
Merge pull request #1 from valky01/muj-branch

merguju - franta