Merging from sciactive/pnotify