Merge pull request #119 from Rav3nPL/patch-2