Merge pull request #1 from zlapa/master

proba z lapa