Version 1.1.1 -> 1.2
Merge branch 'master' of https://github.com/shrtlist/UniversalDemo