Lollipop adjustments
Merge branch 'master' of https://github.com/MasDevProject/CSharp.Common