silkentrance Merge pull request #271 from robertoaceves/patch-1