diff --git a/README.markdown b/README.markdown
index c78c07f4..cb1e2e83 100644
--- a/README.markdown
+++ b/README.markdown
@@ -13,7 +13,7 @@ However 1.0.0 Beta fixes a *lot* of problems over 0.2.x, so even as it is called
 I'd recommend to use the beta instead of the 0.2.3 even for production.
 
 froh42 will return to develop for java-apns in October, so I expect the 1.0.0 final
-to be released start of November.
+to be released start of November. Edited!
 
 
 Introduction
diff --git a/src/main/java/com/notnoop/apns/internal/Utilities.java b/src/main/java/com/notnoop/apns/internal/Utilities.java
index 1849098b..5350ffe9 100644
--- a/src/main/java/com/notnoop/apns/internal/Utilities.java
+++ b/src/main/java/com/notnoop/apns/internal/Utilities.java
@@ -38,6 +38,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.net.Socket;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
@@ -110,11 +111,7 @@ public static String encodeHex(final byte[] bytes) {
     }
 
     public static byte[] toUTF8Bytes(final String s) {
-        try {
-            return s.getBytes("UTF-8");
-        } catch (final UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        return s.getBytes(StandardCharsets.UTF_8);
     }
 
     public static byte[] marshall(final byte command, final byte[] deviceToken, final byte[] payload) {
diff --git a/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java b/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java
index 833bed55..3d8060bb 100644
--- a/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java
+++ b/src/test/java/com/notnoop/apns/internal/TlsTunnelBuilderTest.java
@@ -33,6 +33,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 //import java.net.InetSocketAddress;
 //import java.net.Proxy;
 //import java.net.Socket;
@@ -72,6 +73,6 @@ public void invalidProxyParams() throws IOException {
     }
 
     private InputStream inputStream(String content) throws IOException {
-        return new ByteArrayInputStream(content.getBytes("UTF-8"));
+        return new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
     }
 }