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

Merge pull request  fixes #18