constructor added for context
Merge branch 'master' into oo/builder-improvement
Merge pull request #3 from nr4bt/oo/builder-improvement

Oo/builder improvement