Merge pull request #19 from matuss51/vetva1

Merge pull request #17 from matuss51/master
Merge pull request #20 from matuss51/master

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