Issue 95 : Add option for OSGi compliance