Trying to make more flexible template logic
Merge pull request #231 from nhr/array_protection

Trying to make more flexible template logic