cleaned up the code
Merge pull request #3 from ignacio-valdivieso/bug/cleanup

cleaned up the code
Merge pull request #4 from ignacio-valdivieso/develop

Develop