My lastest changes before merge
Merged
LOL
wnearly done
Merge pull request #6 from mikel-egana-aranguren/master

ya esta casi