Added binary support, toggable via --binary.