Testing merge

Merge image-sending functionality branch