Standardize callback and fix merge issues with dev.
Merge pull request #9 from hybridgroup/standardize-callback

Standardize callback and fix merge issues with dev.