font family support
resolving conflicts
Merge pull request #235 from felipedeboni/master

adding font family support