checkpoint
Merge pull request #15 from esanmiguelc/refactoring

checkpoint