added support for binary and multiple discrete characters
Merge branch 'master' of https://github.com/lukejharmon/traitathon