Merge pull request #140 from chrox/master

fix font-family property ignored if no generic-family is provided
dirty hack to prevent infinite loop on up skip puncutuation