merged pull request #2 from danielsoro 9eec043df2e5804c9fce615ba1545ef47af291b6