Fixed issue #1 : Separated OSGi and non-OSGi usage