diff --git a/.jazzy.yaml b/.jazzy.yaml
index f808537..af3dd6b 100644
--- a/.jazzy.yaml
+++ b/.jazzy.yaml
@@ -1,5 +1,5 @@
 module: HTMLKit
-module_version: 2.1.5
+module_version: 3.0.0
 author: Iskandar Abudiab 
 author_url: https://twitter.com/iabudiab
 github_url: https://github.com/iabudiab/HTMLKit
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84b4c9e..aba75ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## [3.0.0](https://github.com/iabudiab/HTMLKit/releases/tag/3.0.0) 
+
+Released on 2019.03.28
+
+### Breaking Change
+
+- Introduce prefix for `NSString` and `NSCharacterSet` categories to prevent collision with existing code (issue #35)
+
+
 ## [2.1.5](https://github.com/iabudiab/HTMLKit/releases/tag/2.1.5) 
 
 Released on 2018.07.16
diff --git a/HTMLKit.podspec b/HTMLKit.podspec
index 4d07935..bff8eb7 100644
--- a/HTMLKit.podspec
+++ b/HTMLKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name               = "HTMLKit"
-  s.version            = "2.1.5"
+  s.version            = "3.0.0"
   s.summary            = "HTMLKit, an Objective-C framework for your everyday HTML needs."
   s.license            = "MIT"
   s.homepage           = "https://github.com/iabudiab/HTMLKit"
diff --git a/Sources/HTMLKit-Info.plist b/Sources/HTMLKit-Info.plist
index 82ff466..ea8ab7f 100644
--- a/Sources/HTMLKit-Info.plist
+++ b/Sources/HTMLKit-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.5</string>
+	<string>3.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>