diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d571cb2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,43 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
diff --git a/camera/CameraManager.swift b/camera/CameraManager.swift
index 0ee0ff8..99a9202 100644
--- a/camera/CameraManager.swift
+++ b/camera/CameraManager.swift
@@ -35,7 +35,7 @@ public enum CameraOutputQuality: Int {
 /// Class for handling iDevices custom camera usage
 public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
 
-    // PRAGMA MARK - Public properties
+    // MARK: - Public properties
 
     /// CameraManager singleton instance to use the camera.
     public class var sharedInstance: CameraManager {
@@ -163,7 +163,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
         }
     }
 
-    // PRAGMA MARK - Private properties
+    // MARK: - Private properties
 
     private weak var embedingView: UIView?
     private var videoCompletition: ((videoURL: NSURL, error: NSError?) -> Void)?
@@ -195,7 +195,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
         }()
     
     
-    // PRAGMA MARK - CameraManager
+    // MARK: - CameraManager
 
     /**
     Inits a capture session and adds a preview layer to the given view. Preview layer bounds will automaticaly be set to match given view. Default session is initialized with still image output.
@@ -408,7 +408,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
         return self.cameraOutputQuality
     }
     
-    // PRAGMA MARK - AVCaptureFileOutputRecordingDelegate
+    // MARK: - AVCaptureFileOutputRecordingDelegate
 
     public func captureOutput(captureOutput: AVCaptureFileOutput!, didStartRecordingToOutputFileAtURL fileURL: NSURL!, fromConnections connections: [AnyObject]!)
     {
@@ -443,7 +443,7 @@ public class CameraManager: NSObject, AVCaptureFileOutputRecordingDelegate {
         }
     }
 
-    // PRAGMA MARK - CameraManager()
+    // MARK: - CameraManager()
 
     private func _updateTorch(flashMode: CameraFlashMode)
     {