Fixes for application context
Merge pull request #11 from vamshiImaginea/master

Fixes for application context