diff --git a/CocoaSecurity/CocoaSecurity.m b/CocoaSecurity/CocoaSecurity.m
index d1d2ffe..2c88eb7 100644
--- a/CocoaSecurity/CocoaSecurity.m
+++ b/CocoaSecurity/CocoaSecurity.m
@@ -418,10 +418,10 @@
 @implementation CocoaSecurityEncoder
 
 // convert NSData to Base64
-//- (NSString *)base64:(NSData *)data
-//{
-//    return [data base64EncodedString];
-//}
+- (NSString *)base64:(NSData *)data
+{
+    return [data base64EncodedStringWithOptions:0];
+}
 
 // convert NSData to hex string
 - (NSString *)hex:(NSData *)data useLower:(BOOL)isOutputLower
@@ -467,10 +467,10 @@
 
 #pragma mark - CocoaSecurityDecoder
 @implementation CocoaSecurityDecoder
-//- (NSData *)base64:(NSString *)string
-//{
-//    return [NSData dataWithBase64EncodedString:string];
-//}
+- (NSData *)base64:(NSString *)string
+{
+    return [[NSData alloc]initWithBase64EncodedString:string options:0];
+}
 - (NSData *)hex:(NSString *)data
 {
     if (data.length == 0) { return nil; }