eduardocasas Merge pull request #2 from percz/patch-1