Merge pull request #11 from javiertejero/master

Old code clean-up