fix for mavericks and "sender" issues #57, #60, #63