diff --git a/spring-credhub-starter/build.gradle b/spring-credhub-starter/build.gradle
index a7cda0d..4f38dee 100644
--- a/spring-credhub-starter/build.gradle
+++ b/spring-credhub-starter/build.gradle
@@ -27,6 +27,10 @@ buildscript {
 	}
 }
 
+bootRepackage {
+    enabled = false
+}
+
 dependencies {
 	compile project(':spring-credhub-core')
 	compile group: 'org.springframework.boot', name: 'spring-boot-starter'
diff --git a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java
index 2e30b8c..d72e759 100644
--- a/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java
+++ b/spring-credhub-starter/src/main/java/org/springframework/credhub/autoconfig/CredHubOAuth2AutoConfiguration.java
@@ -31,6 +31,8 @@ public class CredHubOAuth2AutoConfiguration {
 
 		/**
 		 * Bean that holds OAuth2 credential informations for CredHub.
+		 * 
+		 * @return the {@link CredHubCredentialsDetails} bean.
 		 */
 		@Bean
 		public CredHubCredentialsDetails credHubCredentialsDetails() {
@@ -39,6 +41,12 @@ public class CredHubOAuth2AutoConfiguration {
 
 		/**
 		 * Preconfigured {@link OAuth2RestTemplate} with OAuth2 credentials for CredHub.
+		 * 
+		 * @param credHubProperties {@link CredHubProperties} for CredHub
+		 * @param clientFactoryWrapper a {@link ClientFactoryWrapper} to customize CredHub
+		 * http requests.
+		 * 
+		 * @return the {@link CredHubOperations} bean.
 		 */
 		@Bean
 		public CredHubOperations oauth2CredHubTemplate(