Application context fix again.
Merge pull request #52 from Bezuhlyi/master

Application context fix again.