Check for app context
Merge pull request #50 from b4stien/fix-app-context

Application context