superscope fixes
Merge branch 'origin/master'