Merge pull request #2 from ingjaso/master

config
Merge pull request #3 from ingjaso/master

Merge Alejandro
Merge pull request #14 from AkaAnto/master

pull request