updated callback merge
Merge pull request #9 from weverett/callback

Forgot to perform final commit on callback