fixed more scope issues
Merge branch 'release-0.1.4'