adding optional context scope, closes #1
Merge branch 'dev'