Merge pull request #1 from wagnert/master

Use Application naming context instead of global context