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

ziadost1