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

Update core.