Merge pull request #353 from RoldanLT/patch-4