Merge pull request #4 from spl0i7/patch-2