updates after merging with trunk
implemented the default sender