Adjust core.
Merge pull request #471 from gsn/master

Adjust core.