merging from app
Merge pull request #1 from thm-design/branch1

merging from appizuiz