Template changes
Merge with master
Merge pull request #5 from studiofact/dev-unscope

Template changes