Merge pull request  fixes #18

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