Merge pull request #10 from amit1618/amit

Amit
bug fixes
Merge branch 'master' of https://github.com/amit1618/APP
formatting changes