Refactoring context.xml
Merge pull request #34 from wagnert/master

Refactoring context.xml