changed some stuff around for new repo
Merge remote-tracking branch 'upstream/master'
Update Scope Options into Master