Use MakeCallback
Merge pull request #280 from kkoopa/master

Use MakeCallback