A clearer way to get all the Typeface. And other little fixes.
Merge remote-tracking branch 'origin/master'