Various changes

Change-Id: I1472cfdd0653dc65d6851f30f12158f34e69dc87
Merge pull request #1 from mifl/jellybean

Various changes