Contributors list added.
Merge pull request #20 from elkarrde/master

Contributors list added.
Merge remote-tracking branch 'upstream/master' into production
Merge pull request #21 from elkarrde/production

Production