bug fix part 2
Merge pull request #17 from SaschaNaz/master

bug fix part 2