Merge pull request #74 from Rav3nPL/patch-10