Fixes #5: add missing functions to trait Location
Fixes #6: add missing functions to Scope
Merge pull request #5 from jokade/scopeAndLocation

Changes to Scope and Location
Merge remote-tracking branch 'upstream/master'