Merge pull request #1 from manelscout4life/jellybean

Bring up to date