Rename pattern matchers to be more explicit. Add tests.
Handle version property of 1
Merge pull request #102 from rnc/master

Improve comments, tests and handle property format of '1' for osgi