Include all fields as options for merge fields

Please add the ability to pick from all my fields including custom ones to add to a merge document or email. I have specific client information that needs to be included in documents without typing in the field information separately for each client and instead be included by adding a merge field that will input that information automatically for me.