Cleaning up code.
Merge pull request #6 from PabloRomanH/dev

Cleaning up code.