Merge pull request #12 from matuss51/vetva1

Merge pull request #11 from matuss51/master fixes #1
Merge pull request #13 from matuss51/master

Merge pull request  fixes #4