Improved pubsub - added unsubscribe and wildcars + tests