Fixed PR #22 for adding support for adding to the setup callback