Fixes #54 Support for OSGI
WIP