diff --git a/camera.xcodeproj/project.xcworkspace/xcshareddata/camera.xccheckout b/camera.xcodeproj/project.xcworkspace/xcshareddata/camera.xccheckout
index eac38a0..343505e 100644
--- a/camera.xcodeproj/project.xcworkspace/xcshareddata/camera.xccheckout
+++ b/camera.xcodeproj/project.xcworkspace/xcshareddata/camera.xccheckout
@@ -34,7 +34,7 @@
 			<key>IDESourceControlWCCIdentifierKey</key>
 			<string>E1D0A3AE6B49B031DF6A25973E5414F28D2A575A</string>
 			<key>IDESourceControlWCCName</key>
-			<string>camera</string>
+			<string>CameraManager</string>
 		</dict>
 	</array>
 </dict>
diff --git a/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate b/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate
index 8b4692d..724b113 100644
Binary files a/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate and b/camera.xcodeproj/project.xcworkspace/xcuserdata/nataliaterlecka.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/camera/CameraManager.swift b/camera/CameraManager.swift
index 851afd5..7d02d61 100644
--- a/camera/CameraManager.swift
+++ b/camera/CameraManager.swift
@@ -199,15 +199,15 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
     private var _cameraOutputQuality = CameraOutputQuality.High
 
     private var tempFilePath: NSURL = {
-        let tempPath = NSTemporaryDirectory().stringByAppendingPathComponent("tempMovie").stringByAppendingPathExtension("mp4")
-        if NSFileManager.defaultManager().fileExistsAtPath(tempPath!) {
+        let tempPath = NSURL(fileURLWithPath: NSTemporaryDirectory()).URLByAppendingPathComponent("tempMovie").URLByAppendingPathExtension("mp4").absoluteString
+        if NSFileManager.defaultManager().fileExistsAtPath(tempPath) {
             do {
-                try NSFileManager.defaultManager().removeItemAtPath(tempPath!)
+                try NSFileManager.defaultManager().removeItemAtPath(tempPath)
             } catch {
                 
             }
         }
-        return NSURL(fileURLWithPath: tempPath!)
+        return NSURL(fileURLWithPath: tempPath)
         }()