fixed #32 Replace "context" by "scope"
Merge branch 'fsil/32-scope' into develop
Merge branch 'develop'