Fixes #459
Merge pull request #484 from bits4breakfast/containeraware-callback

Container is now available in Callback