Merge pull request #1 from eloimuns/jellybean-4.2

LOOOL