Final version changes
make it better
test
test
Merge branch 'master' of https://github.com/nawazhaq/SampleDevApp