Merge pull request #102 from gerardroche/patch-2