diff --git a/.swift-version b/.swift-version
index 9f55b2c..8c50098 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-3.0
+3.1
diff --git a/Library/SwiftyGiphyAPI.swift b/Library/SwiftyGiphyAPI.swift
index c6801a8..dfe618b 100644
--- a/Library/SwiftyGiphyAPI.swift
+++ b/Library/SwiftyGiphyAPI.swift
@@ -183,7 +183,7 @@ public class SwiftyGiphyAPI {
         
         request.httpMethod = method
         
-        if let localparams = params as? [String : AnyObject]
+        if let localparams = params as [String : AnyObject]?
         {
             if method == "GET"
             {
diff --git a/Library/SwiftyGiphyViewController.swift b/Library/SwiftyGiphyViewController.swift
index f762d63..4382d96 100644
--- a/Library/SwiftyGiphyViewController.swift
+++ b/Library/SwiftyGiphyViewController.swift
@@ -234,7 +234,7 @@ public class SwiftyGiphyViewController: UIViewController {
                     self?.errorLabel.isHidden = false
                 }
 
-                print("Giphy error: \(error?.localizedDescription)")
+                print("Giphy error: \(String(describing: error?.localizedDescription))")
                 return
             }
 
@@ -298,7 +298,7 @@ public class SwiftyGiphyViewController: UIViewController {
                         self?.errorLabel.isHidden = false
                     }
 
-                    print("Giphy error: \(error?.localizedDescription)")
+                    print("Giphy error: \(String(describing: error?.localizedDescription))")
                     return
                 }
 
diff --git a/README.md b/README.md
index 50d0347..129acd9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-#SwiftyGiphy
+# SwiftyGiphy
 
 SwiftyGiphy is a library to allow you to easily integrate Giphy image search into your app.
 
-###The library consists of 2 primary components
+### The library consists of 2 primary components
 
 1. **SwiftyGiphyViewController**, which provides a simple UI for search, and callbacks for selected images so you can quickly integrate Giphy in to your app. The controller also supports paging so your users can contiously scroll and see results.
 
@@ -13,13 +13,13 @@ SwiftyGiphy is a library to allow you to easily integrate Giphy image search int
 <br/>
 <img src="https://github.com/52inc/SwiftyGiphy/blob/master/Screenshots/SearchScreenshot.png?raw=true" width=320/>
 
-##Installing
+## Installing
 SwiftyGiphy supports Cocoapods and manual includes.
 
-####Cocoapods
+#### Cocoapods
 `pod 'SwiftyGiphy', '~> 1.0'`
 
-####Manual Include
+#### Manual Include
 Add the files in the Library and Assets folder to your project. You'll also need to include the dependencies:
 
 * [ObjectMapper](https://github.com/Hearst-DD/ObjectMapper) - v2.2
@@ -27,12 +27,12 @@ Add the files in the Library and Assets folder to your project. You'll also need
 * [NSTimer-Blocks](https://github.com/jivadevoe/NSTimer-Blocks)
 * [FLAnimatedImage](https://github.com/Flipboard/FLAnimatedImage) - v1.0
 
-####Carthage / Swift Package Manager
+#### Carthage / Swift Package Manager
 Carthage and Swift Package Manager are not currently supported. But, if you'd like to create a pull request with support for either of these I'd be happy to consider including it.
 
-##Usage
+## Usage
 
-###Setup
+### Setup
 You'll need to configure SwiftyGiphy with your Giphy API key. We recommend you do this in your AppDelegate's -didFinishLaunching method.
 
 `SwiftyGiphyAPI.shared.apiKey = "my_api_key"`
@@ -41,14 +41,14 @@ You'll need to configure SwiftyGiphy with your Giphy API key. We recommend you d
 
 `SwiftyGiphyAPI.shared.apiKey = SwiftyGiphyAPI.publicBetaKey`
 
-###Recommendations
+### Recommendations
 Recommended usage is to present SwiftyGiphyViewController modally in a UINavigationController, with another object (such as the presenting view controller) assigned as the delegate of SwiftyGiphyViewController.
 
 You should dismiss SwiftyGiphyViewController in the delegate methods, when you need to.
 
 **IMPORTANT:** SwiftyGiphyViewController will not dismiss itself. Similar to UIImagePickerController, you'll need to dismiss it from a delegate callback when you want it to go away.
 
-##Components
+## Components
 SwiftyGiphy provides a few useful things for your Giphy integration:
 
 * **SwiftyGiphyViewController** (outlined above) gives you an easy to use UI for interacting with Giphy image search.
@@ -56,10 +56,10 @@ SwiftyGiphy provides a few useful things for your Giphy integration:
 * **SwiftyGiphyAPI** provides easy access to the Giphy API. Currently this supports all of the Giphy API [documented here](https://github.com/Giphy/GiphyAPI), with the exception of image uploads.
 * **SwiftyGiphy Data Models** are provided by the API layer so you can interact with real objects instead of dictionaries and arrays.
 
-##Questions
+## Questions
 If you have questions on how to integrate SwiftyGiphy into your project, feel free to create an issue and we'll try to help the best we can. Please note that we'll only be able to provide assistance for SwiftyGiphy in its 'stock' form, and we won't assist with problems you have due to custom modifications.
 
 Pull requests are encouraged, especially if you feel like assisting in more full implementing the Giphy API layer.
 
-##Apps using SwiftyGiphy
+## Apps using SwiftyGiphy
 If you have an app using SwiftyGiphy, let me know and I'll link to it here.
\ No newline at end of file
diff --git a/SwiftyGiphy.podspec b/SwiftyGiphy.podspec
index e2baeb8..21afaee 100644
--- a/SwiftyGiphy.podspec
+++ b/SwiftyGiphy.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'SwiftyGiphy'
-  s.version          = '1.0.7'
+  s.version          = '1.0.8'
   s.summary          = 'Provides a UI and API layer for Giphy discovery and integration.'
 
 # This description is used to generate tags and improve search results.