Merge pull request #59 from Rav3nPL/patch-6