Cleaned up sender.cpp
Merge branch 'chris'