diff --git a/.travis.yml b/.travis.yml
index 19107e0..6ddc978 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.2 
+osx_image: xcode9.4 
 
 before_install:
   - gem install xcpretty-travis-formatter;
@@ -7,4 +7,4 @@ before_install:
   - pod install --repo-update;
 
 script:
-  - set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator11.2 -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
+  - set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator11.4 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty -f `xcpretty-travis-formatter`
diff --git a/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj b/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj
index c279c1a..bcd6acf 100644
--- a/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj
+++ b/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj
@@ -225,7 +225,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0920;
+				LastUpgradeCheck = 0940;
 				TargetAttributes = {
 					24661CFB1F4EFFF5002CB883 = {
 						CreatedOnToolsVersion = 8.3.2;
@@ -363,6 +363,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -370,6 +371,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -420,6 +422,7 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
@@ -427,6 +430,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
diff --git a/LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme b/LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme
index fc7abc5..90ddaa7 100644
--- a/LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme
+++ b/LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0920"
+   LastUpgradeVersion = "0940"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json b/LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json
index 4749acd..89da0c0 100644
--- a/LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -91,8 +91,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-1024.png",
       "scale" : "1x"
     }
   ],
diff --git a/LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Icon-1024.png
new file mode 100644
index 0000000..1712144
Binary files /dev/null and b/LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Icon-1024.png differ
diff --git a/LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift b/LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift
index 2606add..685bd04 100755
--- a/LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift
+++ b/LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift
@@ -62,7 +62,7 @@ class CollectionViewController<ContentViewType: UIView>: UICollectionViewControl
     }
 
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell: CellType = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! CellType
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! CellType
         cell.setData(data[indexPath.row])
         return cell
     }
diff --git a/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift b/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift
index f6248b3..345f3df 100755
--- a/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift
+++ b/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift
@@ -158,7 +158,7 @@ class FeedItemPinLayoutView: UIView, DataBinder {
         
         posterCommentLabel.pin.below(of: posterTimeLabel).left(hMargin).right(hMargin).marginTop(vMargin).sizeToFit(.width)
         
-        contentImageView.pin.below(of: posterCommentLabel, aligned: .left).right().marginRight(hMargin)
+        contentImageView.pin.below(of: posterCommentLabel, aligned: .left).right().marginTop(vMargin).marginRight(hMargin)
         contentTitleLabel.pin.below(of: contentImageView).left().right().marginHorizontal(hMargin).sizeToFit(.width)
         contentDomainLabel.pin.below(of: contentTitleLabel, aligned: .left).right().marginRight(hMargin).sizeToFit(.width)
         
diff --git a/Podfile.lock b/Podfile.lock
index edd06c7..982096e 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -2,7 +2,7 @@ PODS:
   - FlexLayout (1.3.6)
   - LayoutKit (7.0.2)
   - NotAutoLayout (3.1.1)
-  - PinLayout (1.7.5)
+  - PinLayout (1.7.9)
   - Reveal-SDK (14)
 
 DEPENDENCIES:
@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
   FlexLayout: bcdde388eaf826cfb6f801c8a507e2dca70412fa
   LayoutKit: 183c513f8322f4e22321499e54163864bcdf7d97
   NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84
-  PinLayout: d89b8e7107f872c039f15132094bc417aa83271d
+  PinLayout: 21ce87a865407a7a3c8a38a326611c476095fedf
   Reveal-SDK: 55b5c5545233b680c2f8da734f202acc15d422b7
 
 PODFILE CHECKSUM: 8558b640c2bd1d253536da517991c188d0d44fed