Newest version from dev with @Inject annotation and javadocs