Refactored registry to use only lookup methods.
Fixed failing test.
Convert tabs to spaces
Merge pull request #12 from adaptive-logic/jsr-330

Start of work to support a refactoring to enable jsr330 (DI)