committed in branch1
Merge branch 'master' of https://github.com/swsilverbullet/MyApp into first_branch