Merge lollipop branch

Merge rastomanchiks new lollipop branch.