diff --git a/Demo/TabPageViewControllerDemo/AppDelegate.swift b/Demo/TabPageViewControllerDemo/AppDelegate.swift
index 56e1333..b525496 100644
--- a/Demo/TabPageViewControllerDemo/AppDelegate.swift
+++ b/Demo/TabPageViewControllerDemo/AppDelegate.swift
@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }
diff --git a/Demo/TabPageViewControllerDemo/InfiniteTabPageViewController.swift b/Demo/TabPageViewControllerDemo/InfiniteTabPageViewController.swift
index 14398fb..f1a96ed 100644
--- a/Demo/TabPageViewControllerDemo/InfiniteTabPageViewController.swift
+++ b/Demo/TabPageViewControllerDemo/InfiniteTabPageViewController.swift
@@ -23,7 +23,7 @@ class InfiniteTabPageViewController: TabPageViewController {
         vc4.view.backgroundColor = UIColor(red: 149/255, green: 252/255, blue: 197/255, alpha: 1.0)
         let vc5 = UIViewController()
         vc5.view.backgroundColor = UIColor(red: 252/255, green: 182/255, blue: 106/255, alpha: 1.0)
-        tabItems = [(vc1, "Mon."), (vc2, "Tue."), (vc3, "Wed."), (vc4, "Thu."), (vc5, "Fri.")]
+        tabItems = [(vc1, "Mon.",""), (vc2, "Tue.",""), (vc3, "Wed.",""), (vc4, "Thu.",""), (vc5, "Fri.","")]
         isInfinity = true
         option.currentColor = UIColor(red: 246/255, green: 175/255, blue: 32/255, alpha: 1.0)
         option.tabMargin = 30.0
diff --git a/Demo/TabPageViewControllerDemo/LimitedTabPageViewController.swift b/Demo/TabPageViewControllerDemo/LimitedTabPageViewController.swift
index bcfd419..9034cc4 100644
--- a/Demo/TabPageViewControllerDemo/LimitedTabPageViewController.swift
+++ b/Demo/TabPageViewControllerDemo/LimitedTabPageViewController.swift
@@ -16,7 +16,7 @@ class LimitedTabPageViewController: TabPageViewController {
         let vc1 = UIViewController()
         vc1.view.backgroundColor = UIColor.white
         let vc2 = UIStoryboard(name: "Main", bundle: nil).instantiateViewController(withIdentifier: "ListViewController")
-        tabItems = [(vc1, "First"), (vc2, "Second")]
+        tabItems = [(vc1, "First",""), (vc2, "Second","")]
         option.tabWidth = view.frame.width / CGFloat(tabItems.count)
         option.hidesTopViewOnSwipeType = .all
     }
diff --git a/Sources/TabCollectionCell.swift b/Sources/TabCollectionCell.swift
old mode 100644
new mode 100755
index cc9a02d..1d3ccc5
--- a/Sources/TabCollectionCell.swift
+++ b/Sources/TabCollectionCell.swift
@@ -10,12 +10,13 @@ import UIKit
 
 class TabCollectionCell: UICollectionViewCell {
 
-    var tabItemButtonPressedBlock: ((Void) -> Void)?
+    var tabItemButtonPressedBlock: (() -> Void)?
     var option: TabPageOption = TabPageOption() {
         didSet {
             currentBarViewHeightConstraint.constant = option.currentBarHeight
         }
     }
+    
     var item: String = "" {
         didSet {
             itemLabel.text = item
@@ -23,6 +24,38 @@ class TabCollectionCell: UICollectionViewCell {
             invalidateIntrinsicContentSize()
         }
     }
+    
+    var subItem: String = "" {
+        didSet {
+            subItemTitle.text = subItem
+            if subItem.count > 0{
+                tabSubItem.isHidden = false
+                titleCenterY.constant = -10
+                subItemHeight.constant = 15
+            }
+            else{
+                tabSubItem.isHidden = true
+                titleCenterY.constant = 0
+                subItemHeight.constant = 0
+            }
+        }
+    }
+    
+    var showSubItem : Bool = false{
+        didSet {
+            if showSubItem{
+                tabSubItem.isHidden = false
+                titleCenterY.constant = -10
+                subItemHeight.constant = 15
+            }
+            else{
+                tabSubItem.isHidden = true
+                titleCenterY.constant = 0
+                subItemHeight.constant = 0
+            }
+        }
+    }
+    
     var isCurrent: Bool = false {
         didSet {
             currentBarView.isHidden = !isCurrent
@@ -36,6 +69,13 @@ class TabCollectionCell: UICollectionViewCell {
         }
     }
 
+    @IBOutlet fileprivate weak var tabSubItem: UIView!
+    @IBOutlet fileprivate weak var subItemIcon: UIImageView!
+    @IBOutlet fileprivate weak var subItemTitle: UILabel!
+    @IBOutlet fileprivate weak var subItemHeight: NSLayoutConstraint!
+    @IBOutlet fileprivate weak var titleCenterY: NSLayoutConstraint!
+    
+    
     @IBOutlet fileprivate weak var itemLabel: UILabel!
     @IBOutlet fileprivate weak var currentBarView: UIView!
     @IBOutlet fileprivate weak var currentBarViewHeightConstraint: NSLayoutConstraint!
@@ -47,7 +87,7 @@ class TabCollectionCell: UICollectionViewCell {
     }
 
     override func sizeThatFits(_ size: CGSize) -> CGSize {
-        if item.characters.count == 0 {
+        if item.count == 0 {
             return CGSize.zero
         }
 
@@ -85,12 +125,12 @@ extension TabCollectionCell {
 
     func highlightTitle() {
         itemLabel.textColor = option.currentColor
-        itemLabel.font = UIFont.boldSystemFont(ofSize: option.fontSize)
+        //itemLabel.font = UIFont.boldSystemFont(ofSize: option.fontSize)
     }
 
     func unHighlightTitle() {
         itemLabel.textColor = option.defaultColor
-        itemLabel.font = UIFont.systemFont(ofSize: option.fontSize)
+        //itemLabel.font = UIFont.systemFont(ofSize: option.fontSize)
     }
 }
 
diff --git a/Sources/TabCollectionCell.xib b/Sources/TabCollectionCell.xib
old mode 100644
new mode 100755
index b7c69bd..2a70bed
--- a/Sources/TabCollectionCell.xib
+++ b/Sources/TabCollectionCell.xib
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Effra_Std_Rg.ttf">
+            <string>Effra-Regular</string>
+        </array>
+    </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="TabCollectionCell" id="Njo-bq-MVA" customClass="TabCollectionCell" customModule="TabPageViewController" customModuleProvider="target">
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="TabCollectionCell" id="Njo-bq-MVA" customClass="TabCollectionCell" customModule="FZBooking" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="151" height="50"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
@@ -19,12 +25,46 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IWJ-4f-Lz7">
-                        <rect key="frame" x="59" y="17" width="33" height="16"/>
+                        <rect key="frame" x="59.5" y="6.5" width="33" height="17"/>
                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                        <fontDescription key="fontDescription" name="Effra-Regular" family="Effra" pointSize="14"/>
                         <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
+                    <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MNT-Ho-J0G">
+                        <rect key="frame" x="35" y="26.5" width="80" height="15"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ConfirmAlert" translatesAutoresizingMaskIntoConstraints="NO" id="ix1-0G-fcG">
+                                <rect key="frame" x="3" y="1" width="13" height="13"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="ix1-0G-fcG" secondAttribute="height" multiplier="1:1" id="tOb-OI-Uyy"/>
+                                </constraints>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y0e-2g-Imj">
+                                <rect key="frame" x="19" y="1" width="58" height="13"/>
+                                <fontDescription key="fontDescription" name="Effra-Regular" family="Effra" pointSize="12"/>
+                                <color key="textColor" red="0.098039215690000001" green="0.12860733269999999" blue="0.22771814470000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="0.90980392160000001" blue="0.49803921569999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="y0e-2g-Imj" firstAttribute="leading" secondItem="ix1-0G-fcG" secondAttribute="trailing" constant="3" id="1jX-qk-v5k"/>
+                            <constraint firstItem="y0e-2g-Imj" firstAttribute="top" secondItem="MNT-Ho-J0G" secondAttribute="top" constant="1" id="9va-DB-Pmx"/>
+                            <constraint firstAttribute="bottom" secondItem="y0e-2g-Imj" secondAttribute="bottom" constant="1" id="F4n-Ep-sAo"/>
+                            <constraint firstAttribute="height" constant="15" id="HaD-cT-Dk4"/>
+                            <constraint firstAttribute="trailing" secondItem="y0e-2g-Imj" secondAttribute="trailing" constant="3" id="W8e-H5-pur"/>
+                            <constraint firstItem="ix1-0G-fcG" firstAttribute="top" secondItem="MNT-Ho-J0G" secondAttribute="top" constant="1" id="ap4-Yz-YTk"/>
+                            <constraint firstAttribute="width" constant="80" id="cGM-qY-qwm"/>
+                            <constraint firstItem="ix1-0G-fcG" firstAttribute="leading" secondItem="MNT-Ho-J0G" secondAttribute="leading" constant="3" id="dIL-8T-qD0"/>
+                            <constraint firstAttribute="bottom" secondItem="ix1-0G-fcG" secondAttribute="bottom" constant="1" id="jg0-Iq-KC7"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="2"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </view>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sgu-AL-NbW">
                         <rect key="frame" x="0.0" y="0.0" width="151" height="48"/>
                         <connections>
@@ -44,13 +84,14 @@
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="UkM-Ly-JBr" secondAttribute="trailing" id="03P-6M-I10"/>
                 <constraint firstItem="UkM-Ly-JBr" firstAttribute="leading" secondItem="Njo-bq-MVA" secondAttribute="leading" id="3Yw-nT-8nS"/>
+                <constraint firstItem="MNT-Ho-J0G" firstAttribute="top" secondItem="IWJ-4f-Lz7" secondAttribute="bottom" constant="3" id="6pc-am-KWJ"/>
                 <constraint firstItem="Sgu-AL-NbW" firstAttribute="leading" secondItem="Njo-bq-MVA" secondAttribute="leading" priority="750" id="8A5-j1-wap"/>
                 <constraint firstItem="IWJ-4f-Lz7" firstAttribute="centerX" secondItem="Njo-bq-MVA" secondAttribute="centerX" id="FgI-gv-iu2"/>
                 <constraint firstItem="Sgu-AL-NbW" firstAttribute="top" secondItem="Njo-bq-MVA" secondAttribute="top" priority="750" id="IJz-mm-YfC"/>
                 <constraint firstAttribute="bottom" secondItem="UkM-Ly-JBr" secondAttribute="bottom" id="J0J-D8-GeH"/>
-                <constraint firstItem="IWJ-4f-Lz7" firstAttribute="centerY" secondItem="Njo-bq-MVA" secondAttribute="centerY" id="Um2-ZX-MDO"/>
-                <constraint firstItem="IWJ-4f-Lz7" firstAttribute="centerY" secondItem="Njo-bq-MVA" secondAttribute="centerY" id="YZv-VV-EQn"/>
+                <constraint firstItem="IWJ-4f-Lz7" firstAttribute="centerY" secondItem="Njo-bq-MVA" secondAttribute="centerY" constant="-10" id="Um2-ZX-MDO"/>
                 <constraint firstAttribute="trailing" secondItem="Sgu-AL-NbW" secondAttribute="trailing" priority="750" id="mA5-Ef-SrJ"/>
+                <constraint firstItem="MNT-Ho-J0G" firstAttribute="centerX" secondItem="Njo-bq-MVA" secondAttribute="centerX" id="peL-DT-6c3"/>
                 <constraint firstItem="UkM-Ly-JBr" firstAttribute="top" secondItem="Sgu-AL-NbW" secondAttribute="bottom" priority="750" id="qYV-Rl-all"/>
             </constraints>
             <size key="customSize" width="151" height="50"/>
@@ -58,8 +99,16 @@
                 <outlet property="currentBarView" destination="UkM-Ly-JBr" id="YSM-Pt-X2a"/>
                 <outlet property="currentBarViewHeightConstraint" destination="5V3-an-ChN" id="uAf-Fp-c3f"/>
                 <outlet property="itemLabel" destination="IWJ-4f-Lz7" id="CDS-2J-ZMm"/>
+                <outlet property="subItemHeight" destination="HaD-cT-Dk4" id="CaS-AZ-wgi"/>
+                <outlet property="subItemIcon" destination="ix1-0G-fcG" id="Tc6-Le-x36"/>
+                <outlet property="subItemTitle" destination="y0e-2g-Imj" id="OaI-5G-XqO"/>
+                <outlet property="tabSubItem" destination="MNT-Ho-J0G" id="YUd-oX-gCX"/>
+                <outlet property="titleCenterY" destination="Um2-ZX-MDO" id="FsJ-em-NtI"/>
             </connections>
             <point key="canvasLocation" x="145.5" y="273"/>
         </collectionViewCell>
     </objects>
+    <resources>
+        <image name="ConfirmAlert" width="22" height="19"/>
+    </resources>
 </document>
diff --git a/Sources/TabPageOption.swift b/Sources/TabPageOption.swift
old mode 100644
new mode 100755
index 5a12618..d38f3a9
--- a/Sources/TabPageOption.swift
+++ b/Sources/TabPageOption.swift
@@ -24,25 +24,36 @@ public struct TabPageOption {
     public var defaultColor = UIColor(red: 153/255, green: 153/255, blue: 153/255, alpha: 1.0)
     public var tabHeight: CGFloat = 32.0
     public var tabMargin: CGFloat = 20.0
+    public var enabledIndexes : Int?
+    public var minIndex : Int = 0
     public var tabWidth: CGFloat?
     public var currentBarHeight: CGFloat = 2.0
+    public var currentBarPadding: CGFloat = 0
+    public var navigationBarColor: UIColor = .white
     public var tabBackgroundColor: UIColor = .white
     public var pageBackgoundColor: UIColor = UIColor.white
     public var isTranslucent: Bool = true
     public var hidesTopViewOnSwipeType: HidesTopContentsOnSwipeType = .none
-
+    public var showTabSubItem : Bool = false
     internal var tabBarAlpha: CGFloat {
         return isTranslucent ? 0.95 : 1.0
     }
+    internal var navBarAlpha: CGFloat {
+        return isTranslucent ? 0.95 : 1.0
+    }
     internal var tabBackgroundImage: UIImage {
-        return convertImage()
+        return convertImage(color: tabBackgroundColor)
+    }
+    
+    internal var navigationBarImage: UIImage {
+        return convertImage(color: navigationBarColor)
     }
 
-    fileprivate func convertImage() -> UIImage {
+    fileprivate func convertImage(color : UIColor) -> UIImage {
         let rect : CGRect = CGRect(x: 0, y: 0, width: 1, height: 1)
         UIGraphicsBeginImageContext(rect.size)
         let context : CGContext? = UIGraphicsGetCurrentContext()
-        let backgroundColor = tabBackgroundColor.withAlphaComponent(tabBarAlpha).cgColor
+        let backgroundColor = color.withAlphaComponent(tabBarAlpha).cgColor
         context?.setFillColor(backgroundColor)
         context?.fill(rect)
         let image: UIImage = UIGraphicsGetImageFromCurrentImageContext()!
diff --git a/Sources/TabPageViewController.swift b/Sources/TabPageViewController.swift
index 72f6c89..92b6972 100644
--- a/Sources/TabPageViewController.swift
+++ b/Sources/TabPageViewController.swift
@@ -4,22 +4,28 @@
 //
 //  Created by EndouMari on 2016/02/24.
 //  Copyright © 2016年 EndouMari. All rights reserved.
-//
+//  Edit Anil Santo
 
 import UIKit
 
+public protocol TabPageDelegate {
+    func didMoveToPage(controller: UIViewController, index: Int)
+}
+
 open class TabPageViewController: UIPageViewController {
     open var isInfinity: Bool = false
     open var option: TabPageOption = TabPageOption()
-    open var tabItems: [(viewController: UIViewController, title: String)] = []
-
-    var currentIndex: Int? {
+    open var tabItems: [(viewController: UIViewController, title: String,subTitle : String )] = []
+ 
+    open var tabDelegate : TabPageDelegate?
+    
+    open var currentIndex: Int? {
         guard let viewController = viewControllers?.first else {
             return nil
         }
-        return tabItems.map{ $0.viewController }.index(of: viewController)
+        return tabItems.map{ $0.viewController }.firstIndex(of: viewController)
     }
-    fileprivate var beforeIndex: Int = 0
+    open var beforeIndex: Int = 0
     fileprivate var tabItemsCount: Int {
         return tabItems.count
     }
@@ -79,26 +85,67 @@ open class TabPageViewController: UIPageViewController {
 // MARK: - Public Interface
 
 public extension TabPageViewController {
-
-    public func displayControllerWithIndex(_ index: Int, direction: UIPageViewControllerNavigationDirection, animated: Bool) {
-
-        beforeIndex = index
-        shouldScrollCurrentBar = false
-        let nextViewControllers: [UIViewController] = [tabItems[index].viewController]
-
-        let completion: ((Bool) -> Void) = { [weak self] _ in
-            self?.shouldScrollCurrentBar = true
-            self?.beforeIndex = index
+    
+    func decrementBeforeIndex(){
+        if self.beforeIndex != 0{
+            self.beforeIndex = self.beforeIndex - 1
+        }
+    }
+    
+    func reloadTabView(){
+        self.tabView.pageTabItems = tabItems.map({ $0.title})
+        self.tabView.reloadTabView()
+    }
+    
+    func updateEnableIndexs(index : Int){
+        option.enabledIndexes = index
+        tabView.updateEnableIndexs(index : index) 
+    }
+    
+    func updateMinIndex(index : Int){
+        option.minIndex = index
+        tabView.updateMinIndexs(index : index)
+    }
+    
+    func displayControllerWithIndex(_ index: Int, direction: UIPageViewController.NavigationDirection, animated: Bool) {
+        if option.enabledIndexes == nil{
+            beforeIndex = index
+            shouldScrollCurrentBar = false
+            let nextViewControllers: [UIViewController] = [tabItems[index].viewController]
+            
+            let completion: ((Bool) -> Void) = { [weak self] _ in
+                self?.shouldScrollCurrentBar = true
+                self?.beforeIndex = index
+            }
+            
+            setViewControllers(
+                nextViewControllers,
+                direction: direction,
+                animated: animated,
+                completion: completion)
+            
+            guard isViewLoaded else { return }
+            tabView.updateCurrentIndex(index, shouldScroll: true)
+        }
+        else if option.enabledIndexes != nil && index < option.enabledIndexes! && index >= option.minIndex{
+            beforeIndex = index
+            shouldScrollCurrentBar = false
+            let nextViewControllers: [UIViewController] = [tabItems[index].viewController]
+            
+            let completion: ((Bool) -> Void) = { [weak self] _ in
+                self?.shouldScrollCurrentBar = true
+                self?.beforeIndex = index
+            }
+            
+            setViewControllers(
+                nextViewControllers,
+                direction: direction,
+                animated: animated,
+                completion: completion)
+            
+            guard isViewLoaded else { return }
+            tabView.updateCurrentIndex(index, shouldScroll: true)
         }
-
-        setViewControllers(
-            nextViewControllers,
-            direction: direction,
-            animated: animated,
-            completion: completion)
-
-        guard isViewLoaded else { return }
-        tabView.updateCurrentIndex(index, shouldScroll: true)
     }
 }
 
@@ -107,7 +154,7 @@ public extension TabPageViewController {
 
 extension TabPageViewController {
 
-    fileprivate func setupPageViewController() {
+    public func setupPageViewController() {
         dataSource = self
         delegate = self
         automaticallyAdjustsScrollViewInsets = false
@@ -120,7 +167,7 @@ extension TabPageViewController {
 
     fileprivate func setupScrollView() {
         // Disable PageViewController's ScrollView bounce
-        let scrollView = view.subviews.flatMap { $0 as? UIScrollView }.first
+        let scrollView = view.subviews.compactMap { $0 as? UIScrollView }.first
         scrollView?.scrollsToTop = false
         scrollView?.delegate = self
         scrollView?.backgroundColor = option.pageBackgoundColor
@@ -133,7 +180,7 @@ extension TabPageViewController {
     fileprivate func updateNavigationBar() {
         if let navigationBar = navigationController?.navigationBar {
             navigationBar.shadowImage = UIImage()
-            navigationBar.setBackgroundImage(option.tabBackgroundImage, for: .default)
+            navigationBar.setBackgroundImage(option.navigationBarImage, for: .default)
             navigationBar.isTranslucent = option.isTranslucent
         }
     }
@@ -151,38 +198,49 @@ extension TabPageViewController {
                                         constant: option.tabHeight)
         tabView.addConstraint(height)
         view.addSubview(tabView)
-
-        let top = NSLayoutConstraint(item: tabView,
-                                     attribute: .top,
-                                     relatedBy: .equal,
-                                     toItem: topLayoutGuide,
-                                     attribute: .bottom,
-                                     multiplier:1.0,
-                                     constant: 0.0)
-
-        let left = NSLayoutConstraint(item: tabView,
-                                      attribute: .leading,
-                                      relatedBy: .equal,
-                                      toItem: view,
-                                      attribute: .leading,
-                                      multiplier: 1.0,
-                                      constant: 0.0)
-
-        let right = NSLayoutConstraint(item: view,
-                                       attribute: .trailing,
-                                       relatedBy: .equal,
-                                       toItem: tabView,
-                                       attribute: .trailing,
-                                       multiplier: 1.0,
-                                       constant: 0.0)
-
+        var top = NSLayoutConstraint()
+        var left = NSLayoutConstraint()
+        var right = NSLayoutConstraint()
+        if #available(iOS 9.0, *) {
+            top = tabView.topAnchor.constraint(equalTo: view.topAnchor,
+                                               constant: 0.0)
+            left = tabView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0.0)
+            
+            right = tabView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0.0)
+        } else {
+            top = NSLayoutConstraint(item: tabView,
+                attribute: .top,
+                relatedBy: .equal,
+                toItem: topLayoutGuide,
+                attribute: .bottom,
+                multiplier:1.0,
+                constant: 0.0)
+            
+            left = NSLayoutConstraint(item: tabView,
+                attribute: .leading,
+                relatedBy: .equal,
+                toItem: view,
+                attribute: .leading,
+                multiplier: 1.0,
+                constant: 0.0)
+            
+            right = NSLayoutConstraint(item: view,
+                attribute: .trailing,
+                relatedBy: .equal,
+                toItem: tabView,
+                attribute: .trailing,
+                multiplier: 1.0,
+                constant: 0.0)
+        }
         view.addConstraints([top, left, right])
 
         tabView.pageTabItems = tabItems.map({ $0.title})
+        tabView.pageTabSubItems = tabItems.map({ $0.subTitle})
         tabView.updateCurrentIndex(beforeIndex, shouldScroll: true)
 
-        tabView.pageItemPressedBlock = { [weak self] (index: Int, direction: UIPageViewControllerNavigationDirection) in
-            self?.displayControllerWithIndex(index, direction: direction, animated: true)
+        tabView.pageItemPressedBlock = { [weak self] (index: Int, direction: UIPageViewController.NavigationDirection) in
+                self?.displayControllerWithIndex(index, direction: direction, animated: true)
+            self?.tabDelegate?.didMoveToPage(controller: (self?.tabItems[index].viewController)!, index: index)
         }
 
         tabBarTopConstraint = top
@@ -196,7 +254,18 @@ extension TabPageViewController {
         statusView.translatesAutoresizingMaskIntoConstraints = false
         view.addSubview(statusView)
 
-        let top = NSLayoutConstraint(item: statusView,
+        var top = NSLayoutConstraint()
+        var left = NSLayoutConstraint()
+        var right = NSLayoutConstraint()
+        if #available(iOS 9.0, *) {
+            top = statusView.topAnchor.constraint(equalTo: view.topAnchor,
+                                               constant: 0.0)
+            left = statusView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 0.0)
+            
+            right = statusView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: 0.0)
+        } else {
+        
+            top = NSLayoutConstraint(item: statusView,
                                      attribute: .top,
                                      relatedBy: .equal,
                                      toItem: view,
@@ -204,7 +273,7 @@ extension TabPageViewController {
                                      multiplier:1.0,
                                      constant: 0.0)
 
-        let left = NSLayoutConstraint(item: statusView,
+            left = NSLayoutConstraint(item: statusView,
                                       attribute: .leading,
                                       relatedBy: .equal,
                                       toItem: view,
@@ -212,14 +281,14 @@ extension TabPageViewController {
                                       multiplier: 1.0,
                                       constant: 0.0)
 
-        let right = NSLayoutConstraint(item: view,
+            right = NSLayoutConstraint(item: view,
                                        attribute: .trailing,
                                        relatedBy: .equal,
                                        toItem: statusView,
                                        attribute: .trailing,
                                        multiplier: 1.0,
                                        constant: 0.0)
-
+        }
         let height = NSLayoutConstraint(item: statusView,
                                         attribute: .height,
                                         relatedBy: .equal,
@@ -270,7 +339,7 @@ extension TabPageViewController {
 
         if option.hidesTopViewOnSwipeType != .none {
             tabBarTopConstraint.constant = 0.0
-            UIView.animate(withDuration: TimeInterval(UINavigationControllerHideShowBarDuration)) {
+            UIView.animate(withDuration: TimeInterval(UINavigationController.hideShowBarDuration)) {
                 self.view.layoutIfNeeded()
             }
         }
@@ -283,7 +352,7 @@ extension TabPageViewController {
         guard let tabBarTopConstraint = tabBarTopConstraint else { return }
 
         tabBarTopConstraint.constant = hidden ? -(20.0 + option.tabHeight) : 0.0
-        UIView.animate(withDuration: TimeInterval(UINavigationControllerHideShowBarDuration)) {
+        UIView.animate(withDuration: TimeInterval(UINavigationController.hideShowBarDuration)) {
             self.view.layoutIfNeeded()
         }
     }
@@ -296,7 +365,7 @@ extension TabPageViewController: UIPageViewControllerDataSource {
 
     fileprivate func nextViewController(_ viewController: UIViewController, isAfter: Bool) -> UIViewController? {
 
-        guard var index = tabItems.map({$0.viewController}).index(of: viewController) else {
+        guard var index = tabItems.map({$0.viewController}).firstIndex(of: viewController) else {
             return nil
         }
 
@@ -313,8 +382,15 @@ extension TabPageViewController: UIPageViewControllerDataSource {
                 index = 0
             }
         }
-
-        if index >= 0 && index < tabItems.count {
+        if option.enabledIndexes != nil{
+            if index >= option.minIndex && index < option.enabledIndexes! {
+                return tabItems[index].viewController
+            }
+            else{
+                return  nil
+            }
+        }
+        else if index >= 0 && index < tabItems.count {
             return tabItems[index].viewController
         }
         return nil
@@ -337,17 +413,24 @@ extension TabPageViewController: UIPageViewControllerDelegate {
     public func pageViewController(_ pageViewController: UIPageViewController, willTransitionTo pendingViewControllers: [UIViewController]) {
         shouldScrollCurrentBar = true
         tabView.scrollToHorizontalCenter()
-
         // Order to prevent the the hit repeatedly during animation
         tabView.updateCollectionViewUserInteractionEnabled(false)
     }
 
     public func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
-        if let currentIndex = currentIndex , currentIndex < tabItemsCount {
+        
+        if let currentIndex = currentIndex ,option.enabledIndexes != nil ,currentIndex >= option.minIndex, currentIndex < option.enabledIndexes! {
             tabView.updateCurrentIndex(currentIndex, shouldScroll: false)
             beforeIndex = currentIndex
+            self.tabDelegate?.didMoveToPage(controller: self.tabItems[currentIndex].viewController, index: currentIndex)
         }
-
+        else if let currentIndex = currentIndex , currentIndex < tabItemsCount {
+            tabView.updateCurrentIndex(currentIndex, shouldScroll: false)
+            beforeIndex = currentIndex
+            self.tabDelegate?.didMoveToPage(controller: self.tabItems[currentIndex].viewController, index: currentIndex)
+        }
+        
+        
         tabView.updateCollectionViewUserInteractionEnabled(true)
     }
 }
@@ -377,10 +460,10 @@ extension TabPageViewController: UIScrollViewDelegate {
         }
 
         let scrollOffsetX = scrollView.contentOffset.x - view.frame.width
-        tabView.scrollCurrentBarView(index, contentOffsetX: scrollOffsetX)
+        tabView.scrollCurrentBarView(index, contentOffsetX: scrollOffsetX < 0 ? 0 : scrollOffsetX)
     }
 
     public func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
-        tabView.updateCurrentIndex(beforeIndex, shouldScroll: true)
+        tabView.updateCurrentIndex(currentIndex ?? 0, shouldScroll: true)
     }
 }
diff --git a/Sources/TabView.swift b/Sources/TabView.swift
old mode 100644
new mode 100755
index 0a870b7..baf284d
--- a/Sources/TabView.swift
+++ b/Sources/TabView.swift
@@ -9,16 +9,17 @@
 import UIKit
 
 internal class TabView: UIView {
-
-    var pageItemPressedBlock: ((_ index: Int, _ direction: UIPageViewControllerNavigationDirection) -> Void)?
+    
+    var pageItemPressedBlock: ((_ index: Int, _ direction: UIPageViewController.NavigationDirection) -> Void)?
     var pageTabItems: [String] = [] {
         didSet {
             pageTabItemsCount = pageTabItems.count
             beforeIndex = pageTabItems.count
         }
     }
+    var pageTabSubItems: [String] = []
     var layouted: Bool = false
-
+    
     fileprivate var isInfinity: Bool = false
     fileprivate var option: TabPageOption = TabPageOption()
     fileprivate var beforeIndex: Int = 0
@@ -31,64 +32,64 @@ internal class TabView: UIView {
     fileprivate var cellForSize: TabCollectionCell!
     fileprivate var cachedCellSizes: [IndexPath: CGSize] = [:]
     fileprivate var currentBarViewLeftConstraint: NSLayoutConstraint?
-
+    
     @IBOutlet var contentView: UIView!
     @IBOutlet fileprivate weak var collectionView: UICollectionView!
     @IBOutlet fileprivate weak var currentBarView: UIView!
     @IBOutlet fileprivate weak var currentBarViewWidthConstraint: NSLayoutConstraint!
     @IBOutlet fileprivate weak var currentBarViewHeightConstraint: NSLayoutConstraint!
     @IBOutlet fileprivate weak var bottomBarViewHeightConstraint: NSLayoutConstraint!
-
+    
     init(isInfinity: Bool, option: TabPageOption) {
-       super.init(frame: CGRect.zero)
+        super.init(frame: CGRect.zero)
         self.option = option
         self.isInfinity = isInfinity
         Bundle(for: TabView.self).loadNibNamed("TabView", owner: self, options: nil)
         addSubview(contentView)
         contentView.backgroundColor = option.tabBackgroundColor.withAlphaComponent(option.tabBarAlpha)
-
+        
         let top = NSLayoutConstraint(item: contentView,
-            attribute: .top,
-            relatedBy: .equal,
-            toItem: self,
-            attribute: .top,
-            multiplier: 1.0,
-            constant: 0.0)
-
+                                     attribute: .top,
+                                     relatedBy: .equal,
+                                     toItem: self,
+                                     attribute: .top,
+                                     multiplier: 1.0,
+                                     constant: 0.0)
+        
         let left = NSLayoutConstraint(item: contentView,
-            attribute: .leading,
-            relatedBy: .equal,
-            toItem: self,
-            attribute: .leading,
-            multiplier: 1.0,
-            constant: 0.0)
-
+                                      attribute: .leading,
+                                      relatedBy: .equal,
+                                      toItem: self,
+                                      attribute: .leading,
+                                      multiplier: 1.0,
+                                      constant: 0.0)
+        
         let bottom = NSLayoutConstraint (item: self,
-            attribute: .bottom,
-            relatedBy: .equal,
-            toItem: contentView,
-            attribute: .bottom,
-            multiplier: 1.0,
-            constant: 0.0)
-
+                                         attribute: .bottom,
+                                         relatedBy: .equal,
+                                         toItem: contentView,
+                                         attribute: .bottom,
+                                         multiplier: 1.0,
+                                         constant: 0.0)
+        
         let right = NSLayoutConstraint(item: self,
-            attribute: .trailing,
-            relatedBy: .equal,
-            toItem: contentView,
-            attribute: .trailing,
-            multiplier: 1.0,
-            constant: 0.0)
-
+                                       attribute: .trailing,
+                                       relatedBy: .equal,
+                                       toItem: contentView,
+                                       attribute: .trailing,
+                                       multiplier: 1.0,
+                                       constant: 0.0)
+        
         contentView.translatesAutoresizingMaskIntoConstraints = false
         self.addConstraints([top, left, bottom, right])
-
+        
         let bundle = Bundle(for: TabView.self)
         let nib = UINib(nibName: TabCollectionCell.cellIdentifier(), bundle: bundle)
         collectionView.register(nib, forCellWithReuseIdentifier: TabCollectionCell.cellIdentifier())
-        cellForSize = nib.instantiate(withOwner: nil, options: nil).first as! TabCollectionCell
-
+        cellForSize = nib.instantiate(withOwner: nil, options: nil).first as? TabCollectionCell
+        
         collectionView.scrollsToTop = false
-
+        
         currentBarView.backgroundColor = option.currentColor
         currentBarViewHeightConstraint.constant = option.currentBarHeight
         if !isInfinity {
@@ -96,40 +97,53 @@ internal class TabView: UIView {
             collectionView.addSubview(currentBarView)
             currentBarView.translatesAutoresizingMaskIntoConstraints = false
             let top = NSLayoutConstraint(item: currentBarView,
-                attribute: .top,
-                relatedBy: .equal,
-                toItem: collectionView,
-                attribute: .top,
-                multiplier: 1.0,
-                constant: option.tabHeight - currentBarViewHeightConstraint.constant)
-
+                                         attribute: .top,
+                                         relatedBy: .equal,
+                                         toItem: collectionView,
+                                         attribute: .top,
+                                         multiplier: 1.0,
+                                         constant: option.tabHeight - currentBarViewHeightConstraint.constant)
+            
             let left = NSLayoutConstraint(item: currentBarView,
-                attribute: .leading,
-                relatedBy: .equal,
-                toItem: collectionView,
-                attribute: .leading,
-                multiplier: 1.0,
-                constant: 0.0)
+                                          attribute: .leading,
+                                          relatedBy: .equal,
+                                          toItem: collectionView,
+                                          attribute: .leading,
+                                          multiplier: 1.0,
+                                          constant: 0.0)
             currentBarViewLeftConstraint = left
             collectionView.addConstraints([top, left])
         }
-
+        
         bottomBarViewHeightConstraint.constant = 1.0 / UIScreen.main.scale
     }
-
+    
     required internal init?(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
+    
+    public func updateEnableIndexs(index : Int){
+        option.enabledIndexes = index
+    }
+    
+    public func updateMinIndexs(index : Int){
+        option.minIndex = index
+    }
+    
+    public func reloadTabView(){
+        self.collectionView.reloadData()
+    }
+    
 }
 
 
 // MARK: - View
 
 extension TabView {
-
+    
     /**
      Called when you swipe in isInfinityTabPageViewController, moves the contentOffset of collectionView
-
+     
      - parameter index: Next Index
      - parameter contentOffsetX: contentOffset.x of scrollView of isInfinityTabPageViewController
      */
@@ -142,48 +156,48 @@ extension TabView {
             // Calculate the index at the time of transition from the first item of pageTabItems to the last item
             nextIndex = pageTabItemsCount - 1
         }
-
+        
         if collectionViewContentOffsetX == 0.0 {
             collectionViewContentOffsetX = collectionView.contentOffset.x
         }
-
+        
         let currentIndexPath = IndexPath(item: currentIndex, section: 0)
         let nextIndexPath = IndexPath(item: nextIndex, section: 0)
         if let currentCell = collectionView.cellForItem(at: currentIndexPath) as? TabCollectionCell, let nextCell = collectionView.cellForItem(at: nextIndexPath) as? TabCollectionCell {
             nextCell.hideCurrentBarView()
             currentCell.hideCurrentBarView()
             currentBarView.isHidden = false
-
+            
             if currentBarViewWidth == 0.0 {
                 currentBarViewWidth = currentCell.frame.width
             }
-
+            
             let distance = (currentCell.frame.width / 2.0) + (nextCell.frame.width / 2.0)
             let scrollRate = contentOffsetX / frame.width
-
-            if fabs(scrollRate) > 0.6 {
+            
+            if abs(scrollRate) > 0.6 {
                 nextCell.highlightTitle()
                 currentCell.unHighlightTitle()
             } else {
                 nextCell.unHighlightTitle()
                 currentCell.highlightTitle()
             }
-
-            let width = fabs(scrollRate) * (nextCell.frame.width - currentCell.frame.width)
+            
+            let width = (abs(scrollRate) * (nextCell.frame.width - currentCell.frame.width) ) - 2 * option.currentBarPadding
             if isInfinity {
                 let scroll = scrollRate * distance
                 collectionView.contentOffset.x = collectionViewContentOffsetX + scroll
             } else {
                 if scrollRate > 0 {
-                currentBarViewLeftConstraint?.constant = currentCell.frame.minX + scrollRate * currentCell.frame.width
+                    currentBarViewLeftConstraint?.constant = currentCell.frame.minX + scrollRate * currentCell.frame.width + option.currentBarPadding
                 } else {
-                    currentBarViewLeftConstraint?.constant = currentCell.frame.minX + nextCell.frame.width * scrollRate
+                    currentBarViewLeftConstraint?.constant = currentCell.frame.minX + nextCell.frame.width * scrollRate + option.currentBarPadding
                 }
             }
             currentBarViewWidthConstraint.constant = currentBarViewWidth + width
         }
     }
-
+    
     /**
      Center the current cell after page swipe
      */
@@ -192,92 +206,139 @@ extension TabView {
         collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: false)
         collectionViewContentOffsetX = collectionView.contentOffset.x
     }
-
+    
     /**
      Called in after the transition is complete pages in isInfinityTabPageViewController in the process of updating the current
-
+     
      - parameter index: Next Index
      */
     func updateCurrentIndex(_ index: Int, shouldScroll: Bool) {
-        deselectVisibleCells()
-
-        currentIndex = isInfinity ? index + pageTabItemsCount : index
-
-        let indexPath = IndexPath(item: currentIndex, section: 0)
-        moveCurrentBarView(indexPath, animated: !isInfinity, shouldScroll: shouldScroll)
+        if  option.enabledIndexes != nil , index < option.enabledIndexes! , index >= option.minIndex{
+            deselectVisibleCells()
+            
+            currentIndex = isInfinity ? index + pageTabItemsCount : index
+            
+            let indexPath = IndexPath(item: currentIndex, section: 0)
+            moveCurrentBarView(indexPath, animated: !isInfinity, shouldScroll: shouldScroll)
+        }
+        else{
+            deselectVisibleCells()
+            
+            currentIndex = isInfinity ? index + pageTabItemsCount : index
+            
+            let indexPath = IndexPath(item: currentIndex, section: 0)
+            moveCurrentBarView(indexPath, animated: !isInfinity, shouldScroll: shouldScroll)
+        }
     }
-
+    
     /**
      Make the tapped cell the current if isInfinity is true
-
+     
      - parameter index: Next IndexPath√
      */
     fileprivate func updateCurrentIndexForTap(_ index: Int) {
-        deselectVisibleCells()
-
-        if isInfinity && (index < pageTabItemsCount) || (index >= pageTabItemsCount * 2) {
-            currentIndex = (index < pageTabItemsCount) ? index + pageTabItemsCount : index - pageTabItemsCount
-            shouldScrollToItem = true
-        } else {
-            currentIndex = index
+        if option.enabledIndexes != nil ,index < option.enabledIndexes! ,index >= option.minIndex{
+            deselectVisibleCells()
+            if isInfinity && (index < pageTabItemsCount) || (index >= pageTabItemsCount * 2) {
+                currentIndex = (index < pageTabItemsCount) ? index + pageTabItemsCount : index - pageTabItemsCount
+                shouldScrollToItem = true
+            } else {
+                currentIndex = index
+            }
+            let indexPath = IndexPath(item: index, section: 0)
+            moveCurrentBarView(indexPath, animated: true, shouldScroll: true)
+        }else{
+            deselectVisibleCells()
+            let indexPath = IndexPath(item: currentIndex, section: 0)
+            moveCurrentBarView(indexPath, animated: true, shouldScroll: true)
+            return
         }
-        let indexPath = IndexPath(item: index, section: 0)
-        moveCurrentBarView(indexPath, animated: true, shouldScroll: true)
     }
-
+    
     /**
      Move the collectionView to IndexPath of Current
-
+     
      - parameter indexPath: Next IndexPath
      - parameter animated: true when you tap to move the isInfinityTabCollectionCell
      - parameter shouldScroll:
      */
     fileprivate func moveCurrentBarView(_ indexPath: IndexPath, animated: Bool, shouldScroll: Bool) {
-        if shouldScroll {
-            collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: animated)
-            layoutIfNeeded()
-            collectionViewContentOffsetX = 0.0
-            currentBarViewWidth = 0.0
-        }
-        if let cell = collectionView.cellForItem(at: indexPath) as? TabCollectionCell {
-            currentBarView.isHidden = false
-            if animated && shouldScroll {
-                cell.isCurrent = true
+        if let enabledIndex = option.enabledIndexes, indexPath.item < enabledIndex , indexPath.item >= option.minIndex{
+            if shouldScroll {
+                collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: animated)
+                layoutIfNeeded()
+                collectionViewContentOffsetX = 0.0
+                currentBarViewWidth = 0.0
             }
-            cell.hideCurrentBarView()
-            currentBarViewWidthConstraint.constant = cell.frame.width
-            if !isInfinity {
-                currentBarViewLeftConstraint?.constant = cell.frame.origin.x
+            if let cell = collectionView.cellForItem(at: indexPath) as? TabCollectionCell {
+                currentBarView.isHidden = false
+                if animated && shouldScroll {
+                    cell.isCurrent = true
+                }
+                cell.hideCurrentBarView()
+                currentBarViewWidthConstraint.constant = cell.frame.width - 2 * option.currentBarPadding
+                if !isInfinity {
+                    currentBarViewLeftConstraint?.constant = cell.frame.origin.x + option.currentBarPadding
+                }
+                UIView.animate(withDuration: 0.2, animations: {
+                    self.layoutIfNeeded()
+                }, completion: { _ in
+                    if !animated && shouldScroll {
+                        cell.isCurrent = true
+                    }
+                    
+                    self.updateCollectionViewUserInteractionEnabled(true)
+                })
             }
-            UIView.animate(withDuration: 0.2, animations: {
-                self.layoutIfNeeded()
+            beforeIndex = currentIndex
+        }
+        else{
+            if shouldScroll {
+                collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: animated)
+                layoutIfNeeded()
+                collectionViewContentOffsetX = 0.0
+                currentBarViewWidth = 0.0
+            }
+            if let cell = collectionView.cellForItem(at: indexPath) as? TabCollectionCell {
+                currentBarView.isHidden = false
+                if animated && shouldScroll {
+                    cell.isCurrent = true
+                }
+                cell.hideCurrentBarView()
+                currentBarViewWidthConstraint.constant = cell.frame.width
+                if !isInfinity {
+                    currentBarViewLeftConstraint?.constant = cell.frame.origin.x
+                }
+                UIView.animate(withDuration: 0.2, animations: {
+                    self.layoutIfNeeded()
                 }, completion: { _ in
                     if !animated && shouldScroll {
                         cell.isCurrent = true
                     }
                     
                     self.updateCollectionViewUserInteractionEnabled(true)
-            })
+                })
+            }
+            beforeIndex = currentIndex
         }
-        beforeIndex = currentIndex
     }
-
+    
     /**
      Touch event control of collectionView
-
+     
      - parameter userInteractionEnabled: collectionViewに渡すuserInteractionEnabled
      */
     func updateCollectionViewUserInteractionEnabled(_ userInteractionEnabled: Bool) {
         collectionView.isUserInteractionEnabled = userInteractionEnabled
     }
-
+    
     /**
      Update all of the cells in the display to the unselected state
      */
     fileprivate func deselectVisibleCells() {
         collectionView
             .visibleCells
-            .flatMap { $0 as? TabCollectionCell }
+            .compactMap { $0 as? TabCollectionCell }
             .forEach { $0.isCurrent = false }
     }
 }
@@ -286,24 +347,26 @@ extension TabView {
 // MARK: - UICollectionViewDataSource
 
 extension TabView: UICollectionViewDataSource {
-
+    
     internal func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return isInfinity ? pageTabItemsCount * 3 : pageTabItemsCount
     }
-
+    
     internal func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: TabCollectionCell.cellIdentifier(), for: indexPath) as! TabCollectionCell
         configureCell(cell, indexPath: indexPath)
         return cell
     }
-
+    
     fileprivate func configureCell(_ cell: TabCollectionCell, indexPath: IndexPath) {
         let fixedIndex = isInfinity ? indexPath.item % pageTabItemsCount : indexPath.item
+        //        cell.showSubItem = option.showTabSubItem
+        cell.subItem = pageTabSubItems[fixedIndex]
         cell.item = pageTabItems[fixedIndex]
         cell.option = option
         cell.isCurrent = fixedIndex == (currentIndex % pageTabItemsCount)
         cell.tabItemButtonPressedBlock = { [weak self, weak cell] in
-            var direction: UIPageViewControllerNavigationDirection = .forward
+            var direction: UIPageViewController.NavigationDirection = .forward
             if let pageTabItemsCount = self?.pageTabItemsCount, let currentIndex = self?.currentIndex {
                 if self?.isInfinity == true {
                     if (indexPath.item < pageTabItemsCount) || (indexPath.item < currentIndex) {
@@ -316,7 +379,7 @@ extension TabView: UICollectionViewDataSource {
                 }
             }
             self?.pageItemPressedBlock?(fixedIndex, direction)
-
+            
             if cell?.isCurrent == false {
                 // Not accept touch events to scroll the animation is finished
                 self?.updateCollectionViewUserInteractionEnabled(false)
@@ -324,7 +387,7 @@ extension TabView: UICollectionViewDataSource {
             self?.updateCurrentIndexForTap(indexPath.item)
         }
     }
-
+    
     func collectionView(_ collectionView: UICollectionView, willDisplay cell: UICollectionViewCell, forItemAt indexPath: IndexPath) {
         // FIXME: Tabs are not displayed when processing is performed during introduction display
         if let cell = cell as? TabCollectionCell, layouted {
@@ -338,7 +401,7 @@ extension TabView: UICollectionViewDataSource {
 // MARK: - UIScrollViewDelegate
 
 extension TabView: UICollectionViewDelegate {
-
+    
     internal func scrollViewDidScroll(_ scrollView: UIScrollView) {
         if scrollView.isDragging {
             currentBarView.isHidden = true
@@ -347,29 +410,29 @@ extension TabView: UICollectionViewDelegate {
                 cell.showCurrentBarView()
             }
         }
-
+        
         guard isInfinity else {
             return
         }
-
+        
         if pageTabItemsWidth == 0.0 {
             pageTabItemsWidth = floor(scrollView.contentSize.width / 3.0)
         }
-
+        
         if (scrollView.contentOffset.x <= 0.0) || (scrollView.contentOffset.x > pageTabItemsWidth * 2.0) {
             scrollView.contentOffset.x = pageTabItemsWidth
         }
-
+        
     }
-
+    
     internal func scrollViewDidEndScrollingAnimation(_ scrollView: UIScrollView) {
         // Accept the touch event because animation is complete
         updateCollectionViewUserInteractionEnabled(true)
-
+        
         guard isInfinity else {
             return
         }
-
+        
         let indexPath = IndexPath(item: currentIndex, section: 0)
         if shouldScrollToItem {
             // After the moved so as not to sense of incongruity, to adjust the contentOffset at the currentIndex
@@ -383,25 +446,25 @@ extension TabView: UICollectionViewDelegate {
 // MARK: - UICollectionViewDelegateFlowLayout
 
 extension TabView: UICollectionViewDelegateFlowLayout {
-
+    
     internal func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
-
+        
         if let size = cachedCellSizes[indexPath] {
             return size
         }
-
+        
         configureCell(cellForSize, indexPath: indexPath)
-
+        
         let size = cellForSize.sizeThatFits(CGSize(width: collectionView.bounds.width, height: option.tabHeight))
         cachedCellSizes[indexPath] = size
-
+        
         return size
     }
-
+    
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
         return 0.0
     }
-
+    
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
         return 0.0
     }
diff --git a/Sources/TabView.xib b/Sources/TabView.xib
old mode 100644
new mode 100755
index 85d8720..98087c3
--- a/Sources/TabView.xib
+++ b/Sources/TabView.xib
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TabView" customModule="TabPageViewController" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TabView" customModule="FZBooking" customModuleProvider="target">
             <connections>
                 <outlet property="bottomBarViewHeightConstraint" destination="Nhe-bO-iAA" id="nBt-ET-PoO"/>
                 <outlet property="collectionView" destination="Xf0-gn-U1c" id="nmM-7j-unw"/>
diff --git a/TabPageViewController.podspec b/TabPageViewController.podspec
index 962b556..8083cc5 100644
--- a/TabPageViewController.podspec
+++ b/TabPageViewController.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "TabPageViewController"
-  s.version          = "0.2.7"
+  s.version          = "1.0.0"
   s.summary          = "Custom UIPageViewController"
 
 # This description is used to generate tags and improve search results.
@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
   # s.screenshots     = "www.example.com/screenshots_1", "www.example.com/screenshots_2"
   s.license          = 'MIT'
   s.author           = { "EndouMari" => "endo@vasily.jp" }
-  s.source           = { :git => "https://github.com/EndouMari/TabPageViewController.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/anilsanto/TabPageViewController.git", :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
 
   s.platform     = :ios, '8.0'
diff --git a/TabPageViewController.xcodeproj/TabPageViewController_Info.plist b/TabPageViewController.xcodeproj/TabPageViewController_Info.plist
index 6bcdeda..d46b09a 100644
--- a/TabPageViewController.xcodeproj/TabPageViewController_Info.plist
+++ b/TabPageViewController.xcodeproj/TabPageViewController_Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.7</string>
+	<string>0.2.8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/TabPageViewController.xcodeproj/project.pbxproj b/TabPageViewController.xcodeproj/project.pbxproj
index e15b023..29b5c4f 100644
--- a/TabPageViewController.xcodeproj/project.pbxproj
+++ b/TabPageViewController.xcodeproj/project.pbxproj
@@ -7,21 +7,21 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4C2122B01E6E8AF300572DBD /* TabCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2122AA1E6E8AF300572DBD /* TabCollectionCell.swift */; };
-		4C2122B11E6E8AF300572DBD /* TabPageOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2122AC1E6E8AF300572DBD /* TabPageOption.swift */; };
-		4C2122B21E6E8AF300572DBD /* TabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2122AE1E6E8AF300572DBD /* TabView.swift */; };
 		4C2122F61E6E9A9000572DBD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2122E81E6E8FB100572DBD /* AppDelegate.swift */; };
 		4C2122F71E6E9A9500572DBD /* ListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2122E41E6E8FA500572DBD /* ListViewController.swift */; };
 		4C2122F81E6E9A9500572DBD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C2122E51E6E8FA500572DBD /* ViewController.swift */; };
 		4C2122F91E6E9AA800572DBD /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C2122F41E6E93DF00572DBD /* LaunchScreen.xib */; };
 		4C2122FA1E6E9AAE00572DBD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4C2122EC1E6E8FC300572DBD /* Main.storyboard */; };
-		4C2122FE1E6EA1FB00572DBD /* TabCollectionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C2122AB1E6E8AF300572DBD /* TabCollectionCell.xib */; };
-		4C2123001E6EA1FB00572DBD /* TabView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C2122AF1E6E8AF300572DBD /* TabView.xib */; };
 		4C4753CA1E7159C600D9DD5C /* TabPageViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* TabPageViewController.framework */; };
 		4C4753CB1E7159C600D9DD5C /* TabPageViewController.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* TabPageViewController.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		F082FDB8216CFD600056A4A7 /* TabCollectionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F082FDB2216CFD600056A4A7 /* TabCollectionCell.xib */; };
+		F082FDB9216CFD600056A4A7 /* TabPageOption.swift in Sources */ = {isa = PBXBuildFile; fileRef = F082FDB3216CFD600056A4A7 /* TabPageOption.swift */; };
+		F082FDBA216CFD610056A4A7 /* TabCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F082FDB4216CFD600056A4A7 /* TabCollectionCell.swift */; };
+		F082FDBB216CFD610056A4A7 /* TabView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F082FDB5216CFD600056A4A7 /* TabView.xib */; };
+		F082FDBC216CFD610056A4A7 /* TabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F082FDB6216CFD600056A4A7 /* TabView.swift */; };
+		F082FDBE216D05450056A4A7 /* TabPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F082FDB7216CFD600056A4A7 /* TabPageViewController.swift */; };
 		F8CE39F71F35AE3A00CF74BA /* LimitedTabPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8CE39F61F35AE3A00CF74BA /* LimitedTabPageViewController.swift */; };
 		F8CE39F91F35AE6500CF74BA /* InfiniteTabPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8CE39F81F35AE6500CF74BA /* InfiniteTabPageViewController.swift */; };
-		OBJ_21 /* TabPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_9 /* TabPageViewController.swift */; };
 		OBJ_28 /* TabPageViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* TabPageViewControllerTests.swift */; };
 		OBJ_30 /* TabPageViewController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* TabPageViewController.framework */; };
 /* End PBXBuildFile section */
@@ -58,11 +58,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		4C2122AA1E6E8AF300572DBD /* TabCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabCollectionCell.swift; sourceTree = "<group>"; };
-		4C2122AB1E6E8AF300572DBD /* TabCollectionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TabCollectionCell.xib; sourceTree = "<group>"; };
-		4C2122AC1E6E8AF300572DBD /* TabPageOption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabPageOption.swift; sourceTree = "<group>"; };
-		4C2122AE1E6E8AF300572DBD /* TabView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabView.swift; sourceTree = "<group>"; };
-		4C2122AF1E6E8AF300572DBD /* TabView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TabView.xib; sourceTree = "<group>"; };
 		4C2122CF1E6E8E9700572DBD /* TabPageViewControllerDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TabPageViewControllerDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4C2122E31E6E8FA500572DBD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Demo/TabPageViewControllerDemo/Info.plist; sourceTree = "<group>"; };
 		4C2122E41E6E8FA500572DBD /* ListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ListViewController.swift; path = Demo/TabPageViewControllerDemo/ListViewController.swift; sourceTree = "<group>"; };
@@ -72,12 +67,17 @@
 		4C2122EE1E6E8FD300572DBD /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Demo/TabPageViewControllerDemo/Assets.xcassets; sourceTree = "<group>"; };
 		4C2122F21E6E91FA00572DBD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		4C2122F51E6E93DF00572DBD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Demo/TabPageViewControllerDemo/Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
+		F082FDB2216CFD600056A4A7 /* TabCollectionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TabCollectionCell.xib; sourceTree = "<group>"; };
+		F082FDB3216CFD600056A4A7 /* TabPageOption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabPageOption.swift; sourceTree = "<group>"; };
+		F082FDB4216CFD600056A4A7 /* TabCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabCollectionCell.swift; sourceTree = "<group>"; };
+		F082FDB5216CFD600056A4A7 /* TabView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TabView.xib; sourceTree = "<group>"; };
+		F082FDB6216CFD600056A4A7 /* TabView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabView.swift; sourceTree = "<group>"; };
+		F082FDB7216CFD600056A4A7 /* TabPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabPageViewController.swift; sourceTree = "<group>"; };
 		F8CE39F61F35AE3A00CF74BA /* LimitedTabPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LimitedTabPageViewController.swift; path = Demo/TabPageViewControllerDemo/LimitedTabPageViewController.swift; sourceTree = "<group>"; };
 		F8CE39F81F35AE6500CF74BA /* InfiniteTabPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = InfiniteTabPageViewController.swift; path = Demo/TabPageViewControllerDemo/InfiniteTabPageViewController.swift; sourceTree = "<group>"; };
 		OBJ_12 /* TabPageViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabPageViewControllerTests.swift; sourceTree = "<group>"; };
 		OBJ_14 /* TabPageViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = TabPageViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		OBJ_15 /* TabPageViewControllerTests.xctest */ = {isa = PBXFileReference; lastKnownFileType = file; path = TabPageViewControllerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		OBJ_9 /* TabPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabPageViewController.swift; sourceTree = "<group>"; };
+		OBJ_15 /* TabPageViewControllerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = TabPageViewControllerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -188,12 +188,12 @@
 		OBJ_8 /* TabPageViewController */ = {
 			isa = PBXGroup;
 			children = (
-				4C2122AA1E6E8AF300572DBD /* TabCollectionCell.swift */,
-				4C2122AB1E6E8AF300572DBD /* TabCollectionCell.xib */,
-				4C2122AC1E6E8AF300572DBD /* TabPageOption.swift */,
-				OBJ_9 /* TabPageViewController.swift */,
-				4C2122AE1E6E8AF300572DBD /* TabView.swift */,
-				4C2122AF1E6E8AF300572DBD /* TabView.xib */,
+				F082FDB4216CFD600056A4A7 /* TabCollectionCell.swift */,
+				F082FDB2216CFD600056A4A7 /* TabCollectionCell.xib */,
+				F082FDB3216CFD600056A4A7 /* TabPageOption.swift */,
+				F082FDB7216CFD600056A4A7 /* TabPageViewController.swift */,
+				F082FDB6216CFD600056A4A7 /* TabView.swift */,
+				F082FDB5216CFD600056A4A7 /* TabView.xib */,
 			);
 			name = TabPageViewController;
 			path = Sources;
@@ -266,10 +266,12 @@
 				TargetAttributes = {
 					4C2122CE1E6E8E9700572DBD = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = ZX4AV7HKD2;
+						DevelopmentTeam = 9B466HZZ89;
+						LastSwiftMigration = 1130;
 						ProvisioningStyle = Automatic;
 					};
 					OBJ_16 = {
+						LastSwiftMigration = 1130;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -279,6 +281,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -308,8 +311,8 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4C2122FE1E6EA1FB00572DBD /* TabCollectionCell.xib in Resources */,
-				4C2123001E6EA1FB00572DBD /* TabView.xib in Resources */,
+				F082FDBB216CFD610056A4A7 /* TabView.xib in Resources */,
+				F082FDB8216CFD600056A4A7 /* TabCollectionCell.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -332,10 +335,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 0;
 			files = (
-				4C2122B11E6E8AF300572DBD /* TabPageOption.swift in Sources */,
-				OBJ_21 /* TabPageViewController.swift in Sources */,
-				4C2122B21E6E8AF300572DBD /* TabView.swift in Sources */,
-				4C2122B01E6E8AF300572DBD /* TabCollectionCell.swift in Sources */,
+				F082FDB9216CFD600056A4A7 /* TabPageOption.swift in Sources */,
+				F082FDBE216D05450056A4A7 /* TabPageViewController.swift in Sources */,
+				F082FDBC216CFD610056A4A7 /* TabView.swift in Sources */,
+				F082FDBA216CFD610056A4A7 /* TabCollectionCell.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -406,7 +409,8 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = ZX4AV7HKD2;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 9B466HZZ89;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -425,10 +429,12 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = jp.vasily.TabPageViewControllerDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = jp.vasily.TabPageViewControllerDemo1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -456,7 +462,8 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = ZX4AV7HKD2;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 9B466HZZ89;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -471,18 +478,22 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = jp.vasily.TabPageViewControllerDemo;
+				PRODUCT_BUNDLE_IDENTIFIER = jp.vasily.TabPageViewControllerDemo1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 		OBJ_18 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -498,6 +509,9 @@
 				PRODUCT_BUNDLE_IDENTIFIER = TabPageViewController;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 5.0;
 				TARGET_NAME = TabPageViewController;
 			};
 			name = Debug;
@@ -505,8 +519,10 @@
 		OBJ_19 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_TESTABILITY = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -522,6 +538,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = TabPageViewController;
 				PRODUCT_MODULE_NAME = "$(TARGET_NAME:c99extidentifier)";
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
+				SWIFT_SWIFT3_OBJC_INFERENCE = On;
+				SWIFT_VERSION = 5.0;
 				TARGET_NAME = TabPageViewController;
 			};
 			name = Release;
@@ -529,6 +547,7 @@
 		OBJ_25 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -546,6 +565,7 @@
 		OBJ_26 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/TabPageViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/TabPageViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/TabPageViewController.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Tests/TabPageViewControllerTests/TabPageViewControllerTests.swift b/Tests/TabPageViewControllerTests/TabPageViewControllerTests.swift
index b98b886..f06d5ca 100644
--- a/Tests/TabPageViewControllerTests/TabPageViewControllerTests.swift
+++ b/Tests/TabPageViewControllerTests/TabPageViewControllerTests.swift
@@ -5,7 +5,7 @@ class TabPageViewControllerTests: XCTestCase {
     func testExample() {
         // This is an example of a functional test case.
         // Use XCTAssert and related functions to verify your tests produce the correct results.
-        XCTAssertEqual(TabPageViewController().text, "Hello, World!")
+//        XCTAssertEqual(TabPageViewController().text, "Hello, World!")
     }