Merge pull request #8 from Diego92/master

edo