Merge pull request #40 from alejandrofcarrera/master

Finish