Fix naming race/subcontext and version
Merge pull request #8 from baranowb/master

Fix naming race/subcontext and version