Update core.
Merge pull request #293 from gsn/master

Update core.