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

Update core.