Moving callback firing code into its own method.
Merge pull request #6 from jamesmoss/master

Moving callback firing code into its own method.