Merge pull request #21 from matuss51/vetva1

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

Merge pull request  fixes #18