Re-implement changes in the AppHelper
Merge pull request #1 from raghav1987/App_Helper_Redo

Re-implement changes in the AppHelper
fix merge conflicts