Merge pull request #1 from Byte-Lab/master

Merge pull request #2 from FerusGrim/patch-1