Add osgi support
Merge remote-tracking branch 'origin/master' into OSGI
Merge pull request #337 from bhoflack/OSGI

Add osgi support