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

280 - template 4