eordano Merge pull request #230 from alcuadrado/patch-1