diff --git a/AJWValidator.podspec b/AJWValidator.podspec
index 944df56..56e64df 100644
--- a/AJWValidator.podspec
+++ b/AJWValidator.podspec
@@ -23,7 +23,7 @@ Built in validations:
 
 DESC
 
-  s.homepage     = "https://github.com/adamwaite/AJWValidator"
+  s.homepage     = "https://github.com/adamwaite/Validator"
 
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
 
@@ -33,7 +33,7 @@ DESC
   s.platform     = :ios
   s.platform     = :ios, '6.0'
 
-  s.source       = { :git => "https://github.com/adamwaite/AJWValidator.git", :tag => "v0.0.8" }
+  s.source       = { :git => "https://github.com/adamwaite/Validator.git", :tag => "v0.0.8" }
   s.source_files  = 'AJWValidator', 'AJWValidator/**/*.{h,m}'
   s.public_header_files = 'AJWValidator/AJWValidator.h', 'AJWValidator/UIView+AJWValidator.h'
 
diff --git a/AJWValidator/AJWValidator.m b/AJWValidator/AJWValidator.m
index e317345..6d5a1de 100644
--- a/AJWValidator/AJWValidator.m
+++ b/AJWValidator/AJWValidator.m
@@ -52,7 +52,7 @@ of this software and associated documentation files (the "Software"), to deal
     }
 }
 
-NSString * const AJWValidatorRegularExpressionPatternEmail = @"^[_A-Za-z0-9-+]+(\\.[_A-Za-z0-9-+]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z‌​]{2,4})$";
+NSString * const AJWValidatorRegularExpressionPatternEmail = @"^[_A-Za-z0-9-+]+(\\.[_A-Za-z0-9-+]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9-]+)*(\\.[A-Za-z‌​]{2,6})$";
 
 NSString * const AJWValidatorRegularExpressionPatternContainsNumber = @".*\\d.*";
 
@@ -343,4 +343,4 @@ - (NSUInteger)ruleCount
     return [self.rules count];
 }
 
-@end
\ No newline at end of file
+@end
diff --git a/README.md b/README.md
index 5407ab4..6399336 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # AJWValidator
 
-> 💀 This library has been rewritten in Swift 2.0 and is no longer maintained in Objective-C (See [master](https://github.com/adamwaite/Validator/master). Here rests the final version (0.0.8).
+> 💀 This library has been rewritten in Swift 2.0 and is no longer maintained in Objective-C (See [master](https://github.com/adamwaite/Validator). Here rests the final version (0.0.8).
 
 AJWValidator provides drop in user input validation for your iOS apps. It features a number of built in validation rules, some convenience methods to verify user input, a validation state change handler block, a public error messages collection, and a category on UIView to provide validate-as-input functionality to supported input view types. It's not opinionated, it's your app and it's up to you how you want handle validation errors on the UI.