Merge pull request #22 from matuss51/master

Merge pull request  fixes #18
Merge pull request #23 from matuss51/vetva1

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