fixes #110 incl. comment
Merge pull request #111 from flashspys/master

fixes #110 incl. comment