Fixes # 21 - Escape single quotes; insert another line for message