Default scope fixes
Merge pull request #28 from Mehonoshin/master

Default scope fixes