Fix a bug and add -sender option