diff --git a/AutoKeyboard.podspec b/AutoKeyboard.podspec
index 62d1f32..0085fb0 100644
--- a/AutoKeyboard.podspec
+++ b/AutoKeyboard.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "AutoKeyboard"
-  s.version      = "1.0.1"
+  s.version      = "1.0.2"
   s.summary      = "Automatic Keyboard handling with ease"
   s.description  = "Automatic bottom constraints changes with extreamly easy integration."
   s.homepage  	 = "https://github.com/chanonly123/AutoKeyboard"
@@ -80,7 +80,7 @@ Pod::Spec.new do |s|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-s.source       = { :git => "https://github.com/chanonly123/AutoKeyboard.git", :tag => "1.0.1" }
+s.source       = { :git => "https://github.com/chanonly123/AutoKeyboard.git", :tag => "1.0.2" }
 
 
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
diff --git a/AutoKeyboard/AutoKeyboard/AutoKeyboard.swift b/AutoKeyboard/AutoKeyboard/AutoKeyboard.swift
index e1c3718..c2e1034 100644
--- a/AutoKeyboard/AutoKeyboard/AutoKeyboard.swift
+++ b/AutoKeyboard/AutoKeyboard/AutoKeyboard.swift
@@ -41,7 +41,8 @@ extension UIViewController {
             let const = getBottomConstrainsts()
             for each in const {
                 if let savedValue = saved[each] {
-                    each.constant = savedValue + keyboardFrameEnd.height
+                    let tabBarHeight : CGFloat = (tabBarController?.tabBar.isHidden ?? true) ? 0 : tabBarController?.tabBar.bounds.height ?? 0
+                    each.constant = savedValue + keyboardFrameEnd.height - tabBarHeight
                 }
             }
             animateWithKeyboardEventNotified(notification: notification)
diff --git a/README.md b/README.md
index 098dea9..215e3ae 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ Automatic Keyboard handling with ease. It is fully automatic keyboard handling.
 ![alt tag](https://github.com/chanonly123/AutoKeyboard/blob/master/demo.gif)
 
 ## Features
+- UITabBarController support added.
 - UIViewController extension, no need to extend classes.
 - Device rotation supported.
 - Multiple UIViewController support.