Update template and core.
Merge pull request #308 from gsn/master

Update template and core.