Added removeCallback passing
Refactoring
tests
Merge pull request #25 from foxel/remove_callback

Added removeCallback passing