Merge pull request #16 from BrynCooke/master

Fix bug in injectProperties when dealing with subclassing