merging with trunk
 fixed merging