Merge pull request #3 from spl0i7/patch-1