Added option to include alternative contents to plaintext and HTML as well. Addresses #13