Closes #8
Merge pull request #9 from msilvagarcia/develop

Closes #8