Merge pull request #2 from Alberto97/master

Comp.
Merge pull request #3 from Alberto97/Jellybean

Merge pull request #2 from Alberto97/master