Added a flag to allow for igoring scopes
Hacked to allow me to create a exe...
Merge branch 'upstream'