280 - template 2
Merge pull request #190 from gsn/master

280 - template 2