Merge pull request #13 from matuss51/master

Merge pull request  fixes #4