more changes
Merge https://github.com/nadakbar/myApp