diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..558768a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+/.idea
+/target
+*.iml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 700dbfc..9d782d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.codepine.api</groupId>
     <artifactId>testrail-api-java-client</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>TestRail API Java Client</name>
diff --git a/src/main/java/com/codepine/api/testrail/Request.java b/src/main/java/com/codepine/api/testrail/Request.java
index 219a859..6e642fb 100644
--- a/src/main/java/com/codepine/api/testrail/Request.java
+++ b/src/main/java/com/codepine/api/testrail/Request.java
@@ -44,7 +44,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j;
 
-import javax.xml.bind.DatatypeConverter;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -55,6 +54,7 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.nio.charset.Charset;
+import java.util.Base64;
 
 /**
  * TestRail request.
@@ -118,9 +118,9 @@ public T execute() {
                 con.setRequestProperty("User-Agent", config.getApplicationName().get());
             }
             con.setRequestProperty("Content-Type", "application/json");
-            String basicAuth = "Basic "
-                    + DatatypeConverter.printBase64Binary((config.getUsername()
-                    + ":" + config.getPassword()).getBytes(Charset.forName("UTF-8")));
+            String sourceString = config.getUsername() + ":" + config.getPassword();
+            String basicAuth = "Basic " +
+                Base64.getEncoder().encodeToString(sourceString.getBytes(Charset.forName("UTF-8")));
             con.setRequestProperty("Authorization", basicAuth);
             if (method == Method.POST) {
                 con.setDoOutput(true);