Merge pull request #195 from MartyBurns/master

updated for new scopes