fixing osgi conflict
Merge pull request #6 from rswijesena/master

fixing osgi conflict - by RoshanW