More restrictive automatic context
Merge pull request #1 from sokra/patch-1

More restrictive automatic context