Merge pull request #22 from laeubi/Issue20

Issue #20 Add OSGi Headers
Merge pull request #21 from laeubi/Issue18

Fix for Issue 18: Use Callable as the way to support user functions
Fix issues #23 with font-face getting paresd as id
Merge remote branch 'upstream/master' into font-face