Cleaned sender. Updated.
Merge branch 'chris'