cleaned up and finally added jeknins notification support. Provides test case as well