Correct context and add some properties to context.
Merge pull request #10 from hbz/issue4createcontext

Correct context and add some properties to context.