Merge pull request #94 from Rav3nPL/patch-12