salomj Merge pull request #1 from kikones34/patch-1