Merge pull request #520 from negativeExponent/multitap_option_description