Merge pull request #20 from matuss51/master fixes #1

Merge pull request #19 from matuss51/vetva1 fixes #1