Merge pull request #5 from unikent/master

Merge master into STABLE
Add component name
Merge pull request #6 from unikent/feature/version

Feature/version