Callback update
Merge pull request #10 from TRIMER/master

Callback update