Cleanup code no changes for callback required.
Merge branch 'dev' into standardize-callback
Merge pull request #11 from hybridgroup/standardize-callback

Standardize callback