Glyph drawing

Merge to master