template changes - filesystem changes
Merge pull request #14 from Align/matt-dev

template changes - filesystem changes
Merge pull request #15 from Align/master

update