280 - template 5
Merge pull request #284 from gsn/master

280 - template 5