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

Update core.