Merge pull request #87 from norzechowicz/refactoring

Refactoring
ResourceContext refactoring