Adds character set options. Closes #8