Merge pull request #19 from splatch/master

Improvements in OSGi manifest generation. Fixes #18.