Merge branch 'character-selection' into develop

Fixes #46 on development branch.
Fixes #25 on development branch