worked on client feedback
Merge branch 'master' of https://github.com/parambsingh/nadpe