280 - template 4
Merge pull request #267 from gsn/master

280 - template 4