hopefully have a functional character selection
merge
Merge commit '855e238a3aea48b8ce706515101785a56cb2ba05' into gh-pages