diff --git a/Demos/DemoLightbox/DemoLightbox/ViewController.swift b/Demos/DemoLightbox/DemoLightbox/ViewController.swift
index eac0795..77eb072 100644
--- a/Demos/DemoLightbox/DemoLightbox/ViewController.swift
+++ b/Demos/DemoLightbox/DemoLightbox/ViewController.swift
@@ -5,7 +5,7 @@ class ViewController: UIViewController {
 
   lazy var showButton: UIButton = { [unowned self] in
     let button = UIButton()
-    button.addTarget(self, action: "showLightbox", forControlEvents: .TouchUpInside)
+    button.addTarget(self, action: #selector(showLightbox), forControlEvents: .TouchUpInside)
     button.setTitle("Show me the lightbox", forState: .Normal)
     button.setTitleColor(UIColor(red:0.47, green:0.6, blue:0.13, alpha:1), forState: .Normal)
     button.titleLabel?.font = UIFont(name: "AvenirNextCondensed-DemiBold", size: 30)
diff --git a/Source/Library/LightboxTransition.swift b/Source/Library/LightboxTransition.swift
index 1e82a10..e2da48b 100644
--- a/Source/Library/LightboxTransition.swift
+++ b/Source/Library/LightboxTransition.swift
@@ -5,7 +5,7 @@ class LightboxTransition: UIPercentDrivenInteractiveTransition {
 
   lazy var panGestureRecognizer: UIPanGestureRecognizer = { [unowned self] in
     let gesture = UIPanGestureRecognizer()
-    gesture.addTarget(self, action: "handlePanGesture:")
+    gesture.addTarget(self, action: #selector(handlePanGesture(_:)))
     gesture.delegate = self
 
     return gesture
diff --git a/Source/LightboxController.swift b/Source/LightboxController.swift
index f73a94e..bef17a3 100644
--- a/Source/LightboxController.swift
+++ b/Source/LightboxController.swift
@@ -30,7 +30,7 @@ public class LightboxController: UIViewController {
 
   lazy var overlayTapGestureRecognizer: UITapGestureRecognizer = { [unowned self] in
     let gesture = UITapGestureRecognizer()
-    gesture.addTarget(self, action: "overlayViewDidTap:")
+    gesture.addTarget(self, action: #selector(overlayViewDidTap(_:)))
 
     return gesture
   }()
@@ -363,7 +363,7 @@ extension LightboxController: HeaderViewDelegate {
     let prevIndex = currentPage
     currentPage == numberOfPages - 1 ? previous() : next()
 
-    self.currentPage--
+    self.currentPage -= 1
     self.pageViews.removeAtIndex(prevIndex).removeFromSuperview()
 
     delay(0.5) {
diff --git a/Source/Views/HeaderView.swift b/Source/Views/HeaderView.swift
index d39b5d9..5ae333b 100644
--- a/Source/Views/HeaderView.swift
+++ b/Source/Views/HeaderView.swift
@@ -22,7 +22,7 @@ public class HeaderView: UIView {
 
     button.frame.size = LightboxConfig.CloseButton.size
     button.setAttributedTitle(title, forState: .Normal)
-    button.addTarget(self, action: "closeButtonDidPress:",
+    button.addTarget(self, action: #selector(closeButtonDidPress(_:)),
       forControlEvents: .TouchUpInside)
 
     if let image = LightboxConfig.CloseButton.image {
@@ -43,7 +43,7 @@ public class HeaderView: UIView {
 
     button.frame.size = LightboxConfig.DeleteButton.size
     button.setAttributedTitle(title, forState: .Normal)
-    button.addTarget(self, action: "deleteButtonDidPress:",
+    button.addTarget(self, action: #selector(deleteButtonDidPress(_:)),
       forControlEvents: .TouchUpInside)
 
     if let image = LightboxConfig.DeleteButton.image {
diff --git a/Source/Views/InfoLabel.swift b/Source/Views/InfoLabel.swift
index 86c52c4..3f8b4ac 100644
--- a/Source/Views/InfoLabel.swift
+++ b/Source/Views/InfoLabel.swift
@@ -9,7 +9,7 @@ public class InfoLabel: UILabel {
 
   lazy var tapGestureRecognizer: UITapGestureRecognizer = { [unowned self] in
     let gesture = UITapGestureRecognizer()
-    gesture.addTarget(self, action: "labelDidTap:")
+    gesture.addTarget(self, action: #selector(labelDidTap(_:)))
 
     return gesture
   }()
@@ -50,10 +50,9 @@ public class InfoLabel: UILabel {
 
     truncatedText += ellipsis
 
-    var range = Range<String.Index>(
-      start: truncatedText.endIndex.advancedBy(-(ellipsis.characters.count + 1)),
-      end: truncatedText.endIndex.advancedBy(-ellipsis.characters.count)
-    )
+    let start = truncatedText.endIndex.advancedBy(-(ellipsis.characters.count + 1))
+    let end = truncatedText.endIndex.advancedBy(-ellipsis.characters.count)
+    var range = start..<end
 
     while numberOfLines(truncatedText) > numberOfVisibleLines {
       truncatedText.removeRange(range)
diff --git a/Source/Views/PageView.swift b/Source/Views/PageView.swift
index aaa6631..d6be854 100644
--- a/Source/Views/PageView.swift
+++ b/Source/Views/PageView.swift
@@ -52,7 +52,7 @@ class PageView: UIScrollView {
     showsHorizontalScrollIndicator = false
     showsVerticalScrollIndicator = false
 
-    let doubleTapRecognizer = UITapGestureRecognizer(target: self, action: "scrollViewDoubleTapped:")
+    let doubleTapRecognizer = UITapGestureRecognizer(target: self, action: #selector(scrollViewDoubleTapped(_:)))
     doubleTapRecognizer.numberOfTapsRequired = 2
     doubleTapRecognizer.numberOfTouchesRequired = 1
     addGestureRecognizer(doubleTapRecognizer)