Merge pull request #30 from stevotdo/jellybean

Jellybean
revert pull request #30 - my mistake

Change-Id: I6aa19db1ea2792941c3a70bbcdfd587fe99c5769
Merge pull request #31 from jied83/jellybean

revert pull request #30 - my mistake
Merge pull request #1 from Bademux/jellybean

Jellybean