Use more common letters, for now, later add configuration
Merge branch 'master' into gh-pages