Merge branch 'zecke/features/alpha-numeric'