Improvements in OSGi manifest generation. Fixes #42.