Merge pull request #95 from rubiojr/patch-1