Merge branch 'Issue20' into All-Time-Master
Fix issues #23 with font-face getting paresd as id
Merge remote branch 'upstream/master' into font-face
Merge pull request #24 from laeubi/issue23

Fix for Issue23

Thanks.