Merge pull request #1 from koriym/develop

pull upstream
Fix for @Inject'ing the constructor twice 

(Once on construction, once because of injection)
Merge pull request #40 from craigjbass/develop

Fix for @Inject'ing the constructor twice