Merge pull request #1 from PAC-man/jellybean

Jellybean
Merge pull request #3 from n1kolaa/jellybean

Merge pull request #1 from PAC-man/jellybean