added 2-variable exploration
Merge branch 'master' into locate