diff --git a/.gitignore b/.gitignore
index ae12729..485bef2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@ docs/
 # Fastlane
 fastlane/report.xml
 fastlane/test_output
+Carthage
+.DS_Store
diff --git a/Cartfile b/Cartfile
new file mode 100644
index 0000000..0c268cf
--- /dev/null
+++ b/Cartfile
@@ -0,0 +1,6 @@
+
+github "drekka/Ono" "develop"
+
+github "robbiehanson/CocoaAsyncSocket"
+github "AFNetworking/AFNetworking"
+github "swisspol/GCDWebServer"
\ No newline at end of file
diff --git a/Cartfile.resolved b/Cartfile.resolved
new file mode 100644
index 0000000..a591f83
--- /dev/null
+++ b/Cartfile.resolved
@@ -0,0 +1,4 @@
+github "AFNetworking/AFNetworking" "3.1.0"
+github "robbiehanson/CocoaAsyncSocket" "7.4.3"
+github "swisspol/GCDWebServer" "3.3.2"
+github "drekka/Ono" "67259eb5ed591564149156d88eee38a4669fb183"
diff --git a/CocoaUPnP.xcodeproj/project.pbxproj b/CocoaUPnP.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..71bb603
--- /dev/null
+++ b/CocoaUPnP.xcodeproj/project.pbxproj
@@ -0,0 +1,659 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		6C3EE80F1D06EE1400506613 /* UPPEventServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7C51D06EE1400506613 /* UPPEventServer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8101D06EE1400506613 /* UPPEventServer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7C61D06EE1400506613 /* UPPEventServer.m */; };
+		6C3EE8111D06EE1400506613 /* UPPEventSubscription.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7C71D06EE1400506613 /* UPPEventSubscription.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8121D06EE1400506613 /* UPPEventSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7C81D06EE1400506613 /* UPPEventSubscription.m */; };
+		6C3EE8131D06EE1400506613 /* UPPEventSubscriptionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7C91D06EE1400506613 /* UPPEventSubscriptionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8141D06EE1400506613 /* UPPEventSubscriptionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7CA1D06EE1400506613 /* UPPEventSubscriptionManager.m */; };
+		6C3EE8151D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7CC1D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8161D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7CD1D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.m */; };
+		6C3EE8171D06EE1400506613 /* NSMutableString+xmlNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7CE1D06EE1400506613 /* NSMutableString+xmlNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8181D06EE1400506613 /* NSMutableString+xmlNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7CF1D06EE1400506613 /* NSMutableString+xmlNode.m */; };
+		6C3EE8191D06EE1400506613 /* UPPMetadataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7D01D06EE1400506613 /* UPPMetadataHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE81A1D06EE1400506613 /* UPPMetadataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7D11D06EE1400506613 /* UPPMetadataHelper.m */; };
+		6C3EE81B1D06EE1400506613 /* UPPBasicDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7D31D06EE1400506613 /* UPPBasicDevice.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE81C1D06EE1400506613 /* UPPBasicDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7D41D06EE1400506613 /* UPPBasicDevice.m */; };
+		6C3EE81D1D06EE1400506613 /* UPPConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7D51D06EE1400506613 /* UPPConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE81E1D06EE1400506613 /* UPPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7D61D06EE1400506613 /* UPPConstants.m */; };
+		6C3EE81F1D06EE1400506613 /* UPPDeviceIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7D71D06EE1400506613 /* UPPDeviceIcon.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8201D06EE1400506613 /* UPPDeviceIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7D81D06EE1400506613 /* UPPDeviceIcon.m */; };
+		6C3EE8211D06EE1400506613 /* UPPError.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7D91D06EE1400506613 /* UPPError.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8221D06EE1400506613 /* UPPError.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7DA1D06EE1400506613 /* UPPError.m */; };
+		6C3EE8231D06EE1400506613 /* UPPMediaItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7DB1D06EE1400506613 /* UPPMediaItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8241D06EE1400506613 /* UPPMediaItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7DC1D06EE1400506613 /* UPPMediaItem.m */; };
+		6C3EE8251D06EE1400506613 /* UPPMediaItemResource.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7DD1D06EE1400506613 /* UPPMediaItemResource.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8261D06EE1400506613 /* UPPMediaItemResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7DE1D06EE1400506613 /* UPPMediaItemResource.m */; };
+		6C3EE8271D06EE1400506613 /* UPPMediaRendererDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7DF1D06EE1400506613 /* UPPMediaRendererDevice.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8281D06EE1400506613 /* UPPMediaRendererDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7E01D06EE1400506613 /* UPPMediaRendererDevice.m */; };
+		6C3EE8291D06EE1400506613 /* UPPMediaServerDevice.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7E11D06EE1400506613 /* UPPMediaServerDevice.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE82A1D06EE1400506613 /* UPPMediaServerDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7E21D06EE1400506613 /* UPPMediaServerDevice.m */; };
+		6C3EE82B1D06EE1400506613 /* UPPParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7E31D06EE1400506613 /* UPPParameters.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE82C1D06EE1400506613 /* UPPParameters.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7E41D06EE1400506613 /* UPPParameters.m */; };
+		6C3EE82D1D06EE1400506613 /* UPPServiceDescription.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7E51D06EE1400506613 /* UPPServiceDescription.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE82E1D06EE1400506613 /* UPPServiceDescription.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7E61D06EE1400506613 /* UPPServiceDescription.m */; };
+		6C3EE82F1D06EE1400506613 /* SSDPService.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7E91D06EE1400506613 /* SSDPService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8301D06EE1400506613 /* SSDPService.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7EA1D06EE1400506613 /* SSDPService.m */; };
+		6C3EE8311D06EE1400506613 /* SSDPServiceBrowser.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7EB1D06EE1400506613 /* SSDPServiceBrowser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8321D06EE1400506613 /* SSDPServiceBrowser.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7EC1D06EE1400506613 /* SSDPServiceBrowser.m */; };
+		6C3EE8331D06EE1400506613 /* UPPDiscovery.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7ED1D06EE1400506613 /* UPPDiscovery.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8341D06EE1400506613 /* UPPDiscovery.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7EE1D06EE1400506613 /* UPPDiscovery.m */; };
+		6C3EE8351D06EE1400506613 /* UPPRequestSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7EF1D06EE1400506613 /* UPPRequestSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8361D06EE1400506613 /* UPPRequestSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7F01D06EE1400506613 /* UPPRequestSerializer.m */; };
+		6C3EE8371D06EE1400506613 /* UPPResponseSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7F11D06EE1400506613 /* UPPResponseSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8381D06EE1400506613 /* UPPResponseSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7F21D06EE1400506613 /* UPPResponseSerializer.m */; };
+		6C3EE8391D06EE1400506613 /* UPPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7F31D06EE1400506613 /* UPPSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE83A1D06EE1400506613 /* UPPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7F41D06EE1400506613 /* UPPSessionManager.m */; };
+		6C3EE83B1D06EE1400506613 /* UPPBaseParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7F61D06EE1400506613 /* UPPBaseParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE83C1D06EE1400506613 /* UPPBaseParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7F71D06EE1400506613 /* UPPBaseParser.m */; };
+		6C3EE83D1D06EE1400506613 /* UPPDeviceParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7F81D06EE1400506613 /* UPPDeviceParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE83E1D06EE1400506613 /* UPPDeviceParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7F91D06EE1400506613 /* UPPDeviceParser.m */; };
+		6C3EE83F1D06EE1400506613 /* UPPErrorParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7FA1D06EE1400506613 /* UPPErrorParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8401D06EE1400506613 /* UPPErrorParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7FB1D06EE1400506613 /* UPPErrorParser.m */; };
+		6C3EE8411D06EE1400506613 /* UPPLastChangeParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7FC1D06EE1400506613 /* UPPLastChangeParser.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		6C3EE8421D06EE1400506613 /* UPPLastChangeParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7FD1D06EE1400506613 /* UPPLastChangeParser.m */; };
+		6C3EE8431D06EE1400506613 /* UPPMediaItemParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE7FE1D06EE1400506613 /* UPPMediaItemParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8441D06EE1400506613 /* UPPMediaItemParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE7FF1D06EE1400506613 /* UPPMediaItemParser.m */; };
+		6C3EE8451D06EE1400506613 /* UPPResponseParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE8001D06EE1400506613 /* UPPResponseParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8461D06EE1400506613 /* UPPResponseParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE8011D06EE1400506613 /* UPPResponseParser.m */; };
+		6C3EE8471D06EE1400506613 /* UPPMediaItemProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE8031D06EE1400506613 /* UPPMediaItemProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8481D06EE1400506613 /* UPPAVTransportService.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE8051D06EE1400506613 /* UPPAVTransportService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8491D06EE1400506613 /* UPPAVTransportService.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE8061D06EE1400506613 /* UPPAVTransportService.m */; };
+		6C3EE84A1D06EE1400506613 /* UPPBasicService.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE8071D06EE1400506613 /* UPPBasicService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE84B1D06EE1400506613 /* UPPBasicService.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE8081D06EE1400506613 /* UPPBasicService.m */; };
+		6C3EE84C1D06EE1400506613 /* UPPConnectionManagerService.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE8091D06EE1400506613 /* UPPConnectionManagerService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE84D1D06EE1400506613 /* UPPConnectionManagerService.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE80A1D06EE1400506613 /* UPPConnectionManagerService.m */; };
+		6C3EE84E1D06EE1400506613 /* UPPContentDirectoryService.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE80B1D06EE1400506613 /* UPPContentDirectoryService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE84F1D06EE1400506613 /* UPPContentDirectoryService.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE80C1D06EE1400506613 /* UPPContentDirectoryService.m */; };
+		6C3EE8501D06EE1400506613 /* UPPRenderingControlService.h in Headers */ = {isa = PBXBuildFile; fileRef = 6C3EE80D1D06EE1400506613 /* UPPRenderingControlService.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		6C3EE8511D06EE1400506613 /* UPPRenderingControlService.m in Sources */ = {isa = PBXBuildFile; fileRef = 6C3EE80E1D06EE1400506613 /* UPPRenderingControlService.m */; };
+		6C3EE86C1D06F9F400506613 /* AFNetworking.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C3EE8681D06F9F400506613 /* AFNetworking.framework */; };
+		6C3EE86D1D06F9F400506613 /* CocoaAsyncSocket.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C3EE8691D06F9F400506613 /* CocoaAsyncSocket.framework */; };
+		6C3EE86E1D06F9F400506613 /* GCDWebServers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C3EE86A1D06F9F400506613 /* GCDWebServers.framework */; };
+		6C3EE86F1D06F9F400506613 /* Ono.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C3EE86B1D06F9F400506613 /* Ono.framework */; };
+		6CA6C7761D06ED8800BA8CF1 /* CocoaUPnP.h in Headers */ = {isa = PBXBuildFile; fileRef = 6CA6C7751D06ED8800BA8CF1 /* CocoaUPnP.h */; settings = {ATTRIBUTES = (Public, ); }; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		6C3EE7C51D06EE1400506613 /* UPPEventServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPEventServer.h; sourceTree = "<group>"; };
+		6C3EE7C61D06EE1400506613 /* UPPEventServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPEventServer.m; sourceTree = "<group>"; };
+		6C3EE7C71D06EE1400506613 /* UPPEventSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPEventSubscription.h; sourceTree = "<group>"; };
+		6C3EE7C81D06EE1400506613 /* UPPEventSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPEventSubscription.m; sourceTree = "<group>"; };
+		6C3EE7C91D06EE1400506613 /* UPPEventSubscriptionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPEventSubscriptionManager.h; sourceTree = "<group>"; };
+		6C3EE7CA1D06EE1400506613 /* UPPEventSubscriptionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = UPPEventSubscriptionManager.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		6C3EE7CC1D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+firstObjectMatchingPredicate.h"; sourceTree = "<group>"; };
+		6C3EE7CD1D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+firstObjectMatchingPredicate.m"; sourceTree = "<group>"; };
+		6C3EE7CE1D06EE1400506613 /* NSMutableString+xmlNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableString+xmlNode.h"; sourceTree = "<group>"; };
+		6C3EE7CF1D06EE1400506613 /* NSMutableString+xmlNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableString+xmlNode.m"; sourceTree = "<group>"; };
+		6C3EE7D01D06EE1400506613 /* UPPMetadataHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPMetadataHelper.h; sourceTree = "<group>"; };
+		6C3EE7D11D06EE1400506613 /* UPPMetadataHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPMetadataHelper.m; sourceTree = "<group>"; };
+		6C3EE7D31D06EE1400506613 /* UPPBasicDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPBasicDevice.h; sourceTree = "<group>"; };
+		6C3EE7D41D06EE1400506613 /* UPPBasicDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPBasicDevice.m; sourceTree = "<group>"; };
+		6C3EE7D51D06EE1400506613 /* UPPConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPConstants.h; sourceTree = "<group>"; };
+		6C3EE7D61D06EE1400506613 /* UPPConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPConstants.m; sourceTree = "<group>"; };
+		6C3EE7D71D06EE1400506613 /* UPPDeviceIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPDeviceIcon.h; sourceTree = "<group>"; };
+		6C3EE7D81D06EE1400506613 /* UPPDeviceIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPDeviceIcon.m; sourceTree = "<group>"; };
+		6C3EE7D91D06EE1400506613 /* UPPError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPError.h; sourceTree = "<group>"; };
+		6C3EE7DA1D06EE1400506613 /* UPPError.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPError.m; sourceTree = "<group>"; };
+		6C3EE7DB1D06EE1400506613 /* UPPMediaItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPMediaItem.h; sourceTree = "<group>"; };
+		6C3EE7DC1D06EE1400506613 /* UPPMediaItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPMediaItem.m; sourceTree = "<group>"; };
+		6C3EE7DD1D06EE1400506613 /* UPPMediaItemResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPMediaItemResource.h; sourceTree = "<group>"; };
+		6C3EE7DE1D06EE1400506613 /* UPPMediaItemResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPMediaItemResource.m; sourceTree = "<group>"; };
+		6C3EE7DF1D06EE1400506613 /* UPPMediaRendererDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPMediaRendererDevice.h; sourceTree = "<group>"; };
+		6C3EE7E01D06EE1400506613 /* UPPMediaRendererDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPMediaRendererDevice.m; sourceTree = "<group>"; };
+		6C3EE7E11D06EE1400506613 /* UPPMediaServerDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPMediaServerDevice.h; sourceTree = "<group>"; };
+		6C3EE7E21D06EE1400506613 /* UPPMediaServerDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPMediaServerDevice.m; sourceTree = "<group>"; };
+		6C3EE7E31D06EE1400506613 /* UPPParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPParameters.h; sourceTree = "<group>"; };
+		6C3EE7E41D06EE1400506613 /* UPPParameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPParameters.m; sourceTree = "<group>"; };
+		6C3EE7E51D06EE1400506613 /* UPPServiceDescription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPServiceDescription.h; sourceTree = "<group>"; };
+		6C3EE7E61D06EE1400506613 /* UPPServiceDescription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPServiceDescription.m; sourceTree = "<group>"; };
+		6C3EE7E91D06EE1400506613 /* SSDPService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSDPService.h; sourceTree = "<group>"; };
+		6C3EE7EA1D06EE1400506613 /* SSDPService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SSDPService.m; sourceTree = "<group>"; };
+		6C3EE7EB1D06EE1400506613 /* SSDPServiceBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SSDPServiceBrowser.h; sourceTree = "<group>"; };
+		6C3EE7EC1D06EE1400506613 /* SSDPServiceBrowser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SSDPServiceBrowser.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		6C3EE7ED1D06EE1400506613 /* UPPDiscovery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPDiscovery.h; sourceTree = "<group>"; };
+		6C3EE7EE1D06EE1400506613 /* UPPDiscovery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPDiscovery.m; sourceTree = "<group>"; };
+		6C3EE7EF1D06EE1400506613 /* UPPRequestSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPRequestSerializer.h; sourceTree = "<group>"; };
+		6C3EE7F01D06EE1400506613 /* UPPRequestSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPRequestSerializer.m; sourceTree = "<group>"; };
+		6C3EE7F11D06EE1400506613 /* UPPResponseSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPResponseSerializer.h; sourceTree = "<group>"; };
+		6C3EE7F21D06EE1400506613 /* UPPResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPResponseSerializer.m; sourceTree = "<group>"; };
+		6C3EE7F31D06EE1400506613 /* UPPSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPSessionManager.h; sourceTree = "<group>"; };
+		6C3EE7F41D06EE1400506613 /* UPPSessionManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPSessionManager.m; sourceTree = "<group>"; };
+		6C3EE7F61D06EE1400506613 /* UPPBaseParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPBaseParser.h; sourceTree = "<group>"; };
+		6C3EE7F71D06EE1400506613 /* UPPBaseParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPBaseParser.m; sourceTree = "<group>"; };
+		6C3EE7F81D06EE1400506613 /* UPPDeviceParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPDeviceParser.h; sourceTree = "<group>"; };
+		6C3EE7F91D06EE1400506613 /* UPPDeviceParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPDeviceParser.m; sourceTree = "<group>"; };
+		6C3EE7FA1D06EE1400506613 /* UPPErrorParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPErrorParser.h; sourceTree = "<group>"; };
+		6C3EE7FB1D06EE1400506613 /* UPPErrorParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPErrorParser.m; sourceTree = "<group>"; };
+		6C3EE7FC1D06EE1400506613 /* UPPLastChangeParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPLastChangeParser.h; sourceTree = "<group>"; };
+		6C3EE7FD1D06EE1400506613 /* UPPLastChangeParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPLastChangeParser.m; sourceTree = "<group>"; };
+		6C3EE7FE1D06EE1400506613 /* UPPMediaItemParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPMediaItemParser.h; sourceTree = "<group>"; };
+		6C3EE7FF1D06EE1400506613 /* UPPMediaItemParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPMediaItemParser.m; sourceTree = "<group>"; };
+		6C3EE8001D06EE1400506613 /* UPPResponseParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPResponseParser.h; sourceTree = "<group>"; };
+		6C3EE8011D06EE1400506613 /* UPPResponseParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPResponseParser.m; sourceTree = "<group>"; };
+		6C3EE8031D06EE1400506613 /* UPPMediaItemProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPMediaItemProtocol.h; sourceTree = "<group>"; };
+		6C3EE8051D06EE1400506613 /* UPPAVTransportService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPAVTransportService.h; sourceTree = "<group>"; };
+		6C3EE8061D06EE1400506613 /* UPPAVTransportService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPAVTransportService.m; sourceTree = "<group>"; };
+		6C3EE8071D06EE1400506613 /* UPPBasicService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPBasicService.h; sourceTree = "<group>"; };
+		6C3EE8081D06EE1400506613 /* UPPBasicService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPBasicService.m; sourceTree = "<group>"; };
+		6C3EE8091D06EE1400506613 /* UPPConnectionManagerService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPConnectionManagerService.h; sourceTree = "<group>"; };
+		6C3EE80A1D06EE1400506613 /* UPPConnectionManagerService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPConnectionManagerService.m; sourceTree = "<group>"; };
+		6C3EE80B1D06EE1400506613 /* UPPContentDirectoryService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPContentDirectoryService.h; sourceTree = "<group>"; };
+		6C3EE80C1D06EE1400506613 /* UPPContentDirectoryService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPContentDirectoryService.m; sourceTree = "<group>"; };
+		6C3EE80D1D06EE1400506613 /* UPPRenderingControlService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPRenderingControlService.h; sourceTree = "<group>"; };
+		6C3EE80E1D06EE1400506613 /* UPPRenderingControlService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UPPRenderingControlService.m; sourceTree = "<group>"; };
+		6C3EE8521D06EE8100506613 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
+		6C3EE8681D06F9F400506613 /* AFNetworking.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AFNetworking.framework; path = Carthage/Build/iOS/AFNetworking.framework; sourceTree = "<group>"; };
+		6C3EE8691D06F9F400506613 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CocoaAsyncSocket.framework; path = Carthage/Build/iOS/CocoaAsyncSocket.framework; sourceTree = "<group>"; };
+		6C3EE86A1D06F9F400506613 /* GCDWebServers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GCDWebServers.framework; path = Carthage/Build/iOS/GCDWebServers.framework; sourceTree = "<group>"; };
+		6C3EE86B1D06F9F400506613 /* Ono.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ono.framework; path = Carthage/Build/iOS/Ono.framework; sourceTree = "<group>"; };
+		6CA6C7721D06ED8700BA8CF1 /* CocoaUPnP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CocoaUPnP.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		6CA6C7751D06ED8800BA8CF1 /* CocoaUPnP.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CocoaUPnP.h; sourceTree = "<group>"; };
+		6CA6C7771D06ED8800BA8CF1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		6CA741F01D09A76B007CCFEF /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
+		6CA741F11D09A76B007CCFEF /* module.private.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.private.modulemap; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		6CA6C76E1D06ED8700BA8CF1 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6C3EE86C1D06F9F400506613 /* AFNetworking.framework in Frameworks */,
+				6C3EE86D1D06F9F400506613 /* CocoaAsyncSocket.framework in Frameworks */,
+				6C3EE86E1D06F9F400506613 /* GCDWebServers.framework in Frameworks */,
+				6C3EE86F1D06F9F400506613 /* Ono.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		6C3EE7C41D06EE1400506613 /* Events */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE7C51D06EE1400506613 /* UPPEventServer.h */,
+				6C3EE7C61D06EE1400506613 /* UPPEventServer.m */,
+				6C3EE7C71D06EE1400506613 /* UPPEventSubscription.h */,
+				6C3EE7C81D06EE1400506613 /* UPPEventSubscription.m */,
+				6C3EE7C91D06EE1400506613 /* UPPEventSubscriptionManager.h */,
+				6C3EE7CA1D06EE1400506613 /* UPPEventSubscriptionManager.m */,
+			);
+			path = Events;
+			sourceTree = "<group>";
+		};
+		6C3EE7CB1D06EE1400506613 /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE7CC1D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.h */,
+				6C3EE7CD1D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.m */,
+				6C3EE7CE1D06EE1400506613 /* NSMutableString+xmlNode.h */,
+				6C3EE7CF1D06EE1400506613 /* NSMutableString+xmlNode.m */,
+				6C3EE7D01D06EE1400506613 /* UPPMetadataHelper.h */,
+				6C3EE7D11D06EE1400506613 /* UPPMetadataHelper.m */,
+			);
+			path = Helpers;
+			sourceTree = "<group>";
+		};
+		6C3EE7D21D06EE1400506613 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE7D31D06EE1400506613 /* UPPBasicDevice.h */,
+				6C3EE7D41D06EE1400506613 /* UPPBasicDevice.m */,
+				6C3EE7D51D06EE1400506613 /* UPPConstants.h */,
+				6C3EE7D61D06EE1400506613 /* UPPConstants.m */,
+				6C3EE7D71D06EE1400506613 /* UPPDeviceIcon.h */,
+				6C3EE7D81D06EE1400506613 /* UPPDeviceIcon.m */,
+				6C3EE7D91D06EE1400506613 /* UPPError.h */,
+				6C3EE7DA1D06EE1400506613 /* UPPError.m */,
+				6C3EE7DB1D06EE1400506613 /* UPPMediaItem.h */,
+				6C3EE7DC1D06EE1400506613 /* UPPMediaItem.m */,
+				6C3EE7DD1D06EE1400506613 /* UPPMediaItemResource.h */,
+				6C3EE7DE1D06EE1400506613 /* UPPMediaItemResource.m */,
+				6C3EE7DF1D06EE1400506613 /* UPPMediaRendererDevice.h */,
+				6C3EE7E01D06EE1400506613 /* UPPMediaRendererDevice.m */,
+				6C3EE7E11D06EE1400506613 /* UPPMediaServerDevice.h */,
+				6C3EE7E21D06EE1400506613 /* UPPMediaServerDevice.m */,
+				6C3EE7E31D06EE1400506613 /* UPPParameters.h */,
+				6C3EE7E41D06EE1400506613 /* UPPParameters.m */,
+				6C3EE7E51D06EE1400506613 /* UPPServiceDescription.h */,
+				6C3EE7E61D06EE1400506613 /* UPPServiceDescription.m */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		6C3EE7E71D06EE1400506613 /* Networking */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE7E81D06EE1400506613 /* SSDP */,
+				6C3EE7ED1D06EE1400506613 /* UPPDiscovery.h */,
+				6C3EE7EE1D06EE1400506613 /* UPPDiscovery.m */,
+				6C3EE7EF1D06EE1400506613 /* UPPRequestSerializer.h */,
+				6C3EE7F01D06EE1400506613 /* UPPRequestSerializer.m */,
+				6C3EE7F11D06EE1400506613 /* UPPResponseSerializer.h */,
+				6C3EE7F21D06EE1400506613 /* UPPResponseSerializer.m */,
+				6C3EE7F31D06EE1400506613 /* UPPSessionManager.h */,
+				6C3EE7F41D06EE1400506613 /* UPPSessionManager.m */,
+			);
+			path = Networking;
+			sourceTree = "<group>";
+		};
+		6C3EE7E81D06EE1400506613 /* SSDP */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE7E91D06EE1400506613 /* SSDPService.h */,
+				6C3EE7EA1D06EE1400506613 /* SSDPService.m */,
+				6C3EE7EB1D06EE1400506613 /* SSDPServiceBrowser.h */,
+				6C3EE7EC1D06EE1400506613 /* SSDPServiceBrowser.m */,
+			);
+			path = SSDP;
+			sourceTree = "<group>";
+		};
+		6C3EE7F51D06EE1400506613 /* Parsers */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE7F61D06EE1400506613 /* UPPBaseParser.h */,
+				6C3EE7F71D06EE1400506613 /* UPPBaseParser.m */,
+				6C3EE7F81D06EE1400506613 /* UPPDeviceParser.h */,
+				6C3EE7F91D06EE1400506613 /* UPPDeviceParser.m */,
+				6C3EE7FA1D06EE1400506613 /* UPPErrorParser.h */,
+				6C3EE7FB1D06EE1400506613 /* UPPErrorParser.m */,
+				6C3EE7FC1D06EE1400506613 /* UPPLastChangeParser.h */,
+				6C3EE7FD1D06EE1400506613 /* UPPLastChangeParser.m */,
+				6C3EE7FE1D06EE1400506613 /* UPPMediaItemParser.h */,
+				6C3EE7FF1D06EE1400506613 /* UPPMediaItemParser.m */,
+				6C3EE8001D06EE1400506613 /* UPPResponseParser.h */,
+				6C3EE8011D06EE1400506613 /* UPPResponseParser.m */,
+			);
+			path = Parsers;
+			sourceTree = "<group>";
+		};
+		6C3EE8021D06EE1400506613 /* Protocols */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE8031D06EE1400506613 /* UPPMediaItemProtocol.h */,
+			);
+			path = Protocols;
+			sourceTree = "<group>";
+		};
+		6C3EE8041D06EE1400506613 /* Services */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE8051D06EE1400506613 /* UPPAVTransportService.h */,
+				6C3EE8061D06EE1400506613 /* UPPAVTransportService.m */,
+				6C3EE8071D06EE1400506613 /* UPPBasicService.h */,
+				6C3EE8081D06EE1400506613 /* UPPBasicService.m */,
+				6C3EE8091D06EE1400506613 /* UPPConnectionManagerService.h */,
+				6C3EE80A1D06EE1400506613 /* UPPConnectionManagerService.m */,
+				6C3EE80B1D06EE1400506613 /* UPPContentDirectoryService.h */,
+				6C3EE80C1D06EE1400506613 /* UPPContentDirectoryService.m */,
+				6C3EE80D1D06EE1400506613 /* UPPRenderingControlService.h */,
+				6C3EE80E1D06EE1400506613 /* UPPRenderingControlService.m */,
+			);
+			path = Services;
+			sourceTree = "<group>";
+		};
+		6CA6C7681D06ED8700BA8CF1 = {
+			isa = PBXGroup;
+			children = (
+				6CA741F01D09A76B007CCFEF /* module.modulemap */,
+				6CA741F11D09A76B007CCFEF /* module.private.modulemap */,
+				6CA741EF1D09A6AF007CCFEF /* New Group */,
+				6C3EE8521D06EE8100506613 /* Cartfile */,
+				6CA6C7771D06ED8800BA8CF1 /* Info.plist */,
+				6CA6C7741D06ED8800BA8CF1 /* CocoaUPnP */,
+				6CA6C7731D06ED8700BA8CF1 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		6CA6C7731D06ED8700BA8CF1 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				6CA6C7721D06ED8700BA8CF1 /* CocoaUPnP.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		6CA6C7741D06ED8800BA8CF1 /* CocoaUPnP */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE7C41D06EE1400506613 /* Events */,
+				6C3EE7CB1D06EE1400506613 /* Helpers */,
+				6C3EE7D21D06EE1400506613 /* Models */,
+				6C3EE7E71D06EE1400506613 /* Networking */,
+				6C3EE7F51D06EE1400506613 /* Parsers */,
+				6C3EE8021D06EE1400506613 /* Protocols */,
+				6C3EE8041D06EE1400506613 /* Services */,
+				6CA6C7751D06ED8800BA8CF1 /* CocoaUPnP.h */,
+			);
+			path = CocoaUPnP;
+			sourceTree = "<group>";
+		};
+		6CA741EF1D09A6AF007CCFEF /* New Group */ = {
+			isa = PBXGroup;
+			children = (
+				6C3EE8681D06F9F400506613 /* AFNetworking.framework */,
+				6C3EE8691D06F9F400506613 /* CocoaAsyncSocket.framework */,
+				6C3EE86A1D06F9F400506613 /* GCDWebServers.framework */,
+				6C3EE86B1D06F9F400506613 /* Ono.framework */,
+			);
+			name = "New Group";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		6CA6C76F1D06ED8700BA8CF1 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6C3EE82F1D06EE1400506613 /* SSDPService.h in Headers */,
+				6C3EE83D1D06EE1400506613 /* UPPDeviceParser.h in Headers */,
+				6C3EE8371D06EE1400506613 /* UPPResponseSerializer.h in Headers */,
+				6C3EE84C1D06EE1400506613 /* UPPConnectionManagerService.h in Headers */,
+				6C3EE8111D06EE1400506613 /* UPPEventSubscription.h in Headers */,
+				6C3EE80F1D06EE1400506613 /* UPPEventServer.h in Headers */,
+				6C3EE8211D06EE1400506613 /* UPPError.h in Headers */,
+				6C3EE8351D06EE1400506613 /* UPPRequestSerializer.h in Headers */,
+				6C3EE81D1D06EE1400506613 /* UPPConstants.h in Headers */,
+				6C3EE8391D06EE1400506613 /* UPPSessionManager.h in Headers */,
+				6C3EE84E1D06EE1400506613 /* UPPContentDirectoryService.h in Headers */,
+				6C3EE8131D06EE1400506613 /* UPPEventSubscriptionManager.h in Headers */,
+				6C3EE8471D06EE1400506613 /* UPPMediaItemProtocol.h in Headers */,
+				6C3EE8151D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.h in Headers */,
+				6C3EE83B1D06EE1400506613 /* UPPBaseParser.h in Headers */,
+				6C3EE8271D06EE1400506613 /* UPPMediaRendererDevice.h in Headers */,
+				6CA6C7761D06ED8800BA8CF1 /* CocoaUPnP.h in Headers */,
+				6C3EE84A1D06EE1400506613 /* UPPBasicService.h in Headers */,
+				6C3EE8311D06EE1400506613 /* SSDPServiceBrowser.h in Headers */,
+				6C3EE8451D06EE1400506613 /* UPPResponseParser.h in Headers */,
+				6C3EE81B1D06EE1400506613 /* UPPBasicDevice.h in Headers */,
+				6C3EE8231D06EE1400506613 /* UPPMediaItem.h in Headers */,
+				6C3EE8501D06EE1400506613 /* UPPRenderingControlService.h in Headers */,
+				6C3EE8291D06EE1400506613 /* UPPMediaServerDevice.h in Headers */,
+				6C3EE81F1D06EE1400506613 /* UPPDeviceIcon.h in Headers */,
+				6C3EE8171D06EE1400506613 /* NSMutableString+xmlNode.h in Headers */,
+				6C3EE8251D06EE1400506613 /* UPPMediaItemResource.h in Headers */,
+				6C3EE82D1D06EE1400506613 /* UPPServiceDescription.h in Headers */,
+				6C3EE8331D06EE1400506613 /* UPPDiscovery.h in Headers */,
+				6C3EE8431D06EE1400506613 /* UPPMediaItemParser.h in Headers */,
+				6C3EE8481D06EE1400506613 /* UPPAVTransportService.h in Headers */,
+				6C3EE82B1D06EE1400506613 /* UPPParameters.h in Headers */,
+				6C3EE83F1D06EE1400506613 /* UPPErrorParser.h in Headers */,
+				6C3EE8191D06EE1400506613 /* UPPMetadataHelper.h in Headers */,
+				6C3EE8411D06EE1400506613 /* UPPLastChangeParser.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		6CA6C7711D06ED8700BA8CF1 /* CocoaUPnP */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 6CA6C77A1D06ED8800BA8CF1 /* Build configuration list for PBXNativeTarget "CocoaUPnP" */;
+			buildPhases = (
+				6CA6C76D1D06ED8700BA8CF1 /* Sources */,
+				6CA6C76E1D06ED8700BA8CF1 /* Frameworks */,
+				6CA6C76F1D06ED8700BA8CF1 /* Headers */,
+				6CA6C7701D06ED8700BA8CF1 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = CocoaUPnP;
+			productName = CocoaUPnP;
+			productReference = 6CA6C7721D06ED8700BA8CF1 /* CocoaUPnP.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		6CA6C7691D06ED8700BA8CF1 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0730;
+				ORGANIZATIONNAME = ARCAM;
+				TargetAttributes = {
+					6CA6C7711D06ED8700BA8CF1 = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+				};
+			};
+			buildConfigurationList = 6CA6C76C1D06ED8700BA8CF1 /* Build configuration list for PBXProject "CocoaUPnP" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 6CA6C7681D06ED8700BA8CF1;
+			productRefGroup = 6CA6C7731D06ED8700BA8CF1 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				6CA6C7711D06ED8700BA8CF1 /* CocoaUPnP */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		6CA6C7701D06ED8700BA8CF1 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		6CA6C76D1D06ED8700BA8CF1 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				6C3EE8491D06EE1400506613 /* UPPAVTransportService.m in Sources */,
+				6C3EE8181D06EE1400506613 /* NSMutableString+xmlNode.m in Sources */,
+				6C3EE8141D06EE1400506613 /* UPPEventSubscriptionManager.m in Sources */,
+				6C3EE8221D06EE1400506613 /* UPPError.m in Sources */,
+				6C3EE81A1D06EE1400506613 /* UPPMetadataHelper.m in Sources */,
+				6C3EE8401D06EE1400506613 /* UPPErrorParser.m in Sources */,
+				6C3EE83C1D06EE1400506613 /* UPPBaseParser.m in Sources */,
+				6C3EE81E1D06EE1400506613 /* UPPConstants.m in Sources */,
+				6C3EE8261D06EE1400506613 /* UPPMediaItemResource.m in Sources */,
+				6C3EE83A1D06EE1400506613 /* UPPSessionManager.m in Sources */,
+				6C3EE84B1D06EE1400506613 /* UPPBasicService.m in Sources */,
+				6C3EE8341D06EE1400506613 /* UPPDiscovery.m in Sources */,
+				6C3EE8301D06EE1400506613 /* SSDPService.m in Sources */,
+				6C3EE84F1D06EE1400506613 /* UPPContentDirectoryService.m in Sources */,
+				6C3EE8461D06EE1400506613 /* UPPResponseParser.m in Sources */,
+				6C3EE8201D06EE1400506613 /* UPPDeviceIcon.m in Sources */,
+				6C3EE8361D06EE1400506613 /* UPPRequestSerializer.m in Sources */,
+				6C3EE8281D06EE1400506613 /* UPPMediaRendererDevice.m in Sources */,
+				6C3EE82C1D06EE1400506613 /* UPPParameters.m in Sources */,
+				6C3EE8101D06EE1400506613 /* UPPEventServer.m in Sources */,
+				6C3EE8121D06EE1400506613 /* UPPEventSubscription.m in Sources */,
+				6C3EE8511D06EE1400506613 /* UPPRenderingControlService.m in Sources */,
+				6C3EE8321D06EE1400506613 /* SSDPServiceBrowser.m in Sources */,
+				6C3EE8421D06EE1400506613 /* UPPLastChangeParser.m in Sources */,
+				6C3EE81C1D06EE1400506613 /* UPPBasicDevice.m in Sources */,
+				6C3EE8441D06EE1400506613 /* UPPMediaItemParser.m in Sources */,
+				6C3EE82E1D06EE1400506613 /* UPPServiceDescription.m in Sources */,
+				6C3EE82A1D06EE1400506613 /* UPPMediaServerDevice.m in Sources */,
+				6C3EE84D1D06EE1400506613 /* UPPConnectionManagerService.m in Sources */,
+				6C3EE8161D06EE1400506613 /* NSArray+firstObjectMatchingPredicate.m in Sources */,
+				6C3EE8381D06EE1400506613 /* UPPResponseSerializer.m in Sources */,
+				6C3EE83E1D06EE1400506613 /* UPPDeviceParser.m in Sources */,
+				6C3EE8241D06EE1400506613 /* UPPMediaItem.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		6CA6C7781D06ED8800BA8CF1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		6CA6C7791D06ED8800BA8CF1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		6CA6C77B1D06ED8800BA8CF1 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = module.modulemap;
+				MODULEMAP_PRIVATE_FILE = module.private.modulemap;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.com.arcam.cocoaupnp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		6CA6C77C1D06ED8800BA8CF1 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MODULEMAP_FILE = module.modulemap;
+				MODULEMAP_PRIVATE_FILE = module.private.modulemap;
+				PRODUCT_BUNDLE_IDENTIFIER = uk.com.arcam.cocoaupnp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		6CA6C76C1D06ED8700BA8CF1 /* Build configuration list for PBXProject "CocoaUPnP" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6CA6C7781D06ED8800BA8CF1 /* Debug */,
+				6CA6C7791D06ED8800BA8CF1 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		6CA6C77A1D06ED8800BA8CF1 /* Build configuration list for PBXNativeTarget "CocoaUPnP" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				6CA6C77B1D06ED8800BA8CF1 /* Debug */,
+				6CA6C77C1D06ED8800BA8CF1 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 6CA6C7691D06ED8700BA8CF1 /* Project object */;
+}
diff --git a/CocoaUPnP.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/CocoaUPnP.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..04351f3
--- /dev/null
+++ b/CocoaUPnP.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:CocoaUPnP.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/CocoaUPnP.xcodeproj/xcshareddata/xcschemes/CocoaUPnP.xcscheme b/CocoaUPnP.xcodeproj/xcshareddata/xcschemes/CocoaUPnP.xcscheme
new file mode 100644
index 0000000..e71acd8
--- /dev/null
+++ b/CocoaUPnP.xcodeproj/xcshareddata/xcschemes/CocoaUPnP.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "6CA6C7711D06ED8700BA8CF1"
+               BuildableName = "CocoaUPnP.framework"
+               BlueprintName = "CocoaUPnP"
+               ReferencedContainer = "container:CocoaUPnP.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6CA6C7711D06ED8700BA8CF1"
+            BuildableName = "CocoaUPnP.framework"
+            BlueprintName = "CocoaUPnP"
+            ReferencedContainer = "container:CocoaUPnP.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6CA6C7711D06ED8700BA8CF1"
+            BuildableName = "CocoaUPnP.framework"
+            BlueprintName = "CocoaUPnP"
+            ReferencedContainer = "container:CocoaUPnP.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/CocoaUPnP/CocoaUPnP.h b/CocoaUPnP/CocoaUPnP.h
index 5cb33d0..3d434e9 100644
--- a/CocoaUPnP/CocoaUPnP.h
+++ b/CocoaUPnP/CocoaUPnP.h
@@ -3,6 +3,12 @@
 
 #import <Foundation/Foundation.h>
 
+//! Project version number for CocoaUPnP.
+FOUNDATION_EXPORT double CocoaUPnPVersionNumber;
+
+//! Project version string for CocoaUPnP.
+FOUNDATION_EXPORT const unsigned char CocoaUPnPVersionString[];
+
 // Events
 #import "UPPEventServer.h"
 #import "UPPEventSubscription.h"
@@ -35,7 +41,7 @@
 #import "UPPBaseParser.h"
 #import "UPPDeviceParser.h"
 #import "UPPErrorParser.h"
-#import "UPPLastChangeParser.h"
+//#import "UPPLastChangeParser.h"
 #import "UPPMediaItemParser.h"
 #import "UPPResponseParser.h"
 
diff --git a/CocoaUPnP/Events/UPPEventServer.h b/CocoaUPnP/Events/UPPEventServer.h
index ac643c4..3ce9c6f 100644
--- a/CocoaUPnP/Events/UPPEventServer.h
+++ b/CocoaUPnP/Events/UPPEventServer.h
@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import <Foundation/Foundation.h>
-#import <GCDWebServer/GCDWebServer.h>
+#import <GCDWebServers/GCDWebServer.h>
 
 /**
  A delegate protocol for recieving parsed UPnP events.
diff --git a/CocoaUPnP/Events/UPPEventServer.m b/CocoaUPnP/Events/UPPEventServer.m
index b11ffcc..05ac75e 100644
--- a/CocoaUPnP/Events/UPPEventServer.m
+++ b/CocoaUPnP/Events/UPPEventServer.m
@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPEventServer.h"
-#import "GCDWebServerDataRequest.h"
+#import <GCDWebServers/GCDWebServers.h>
 #import "UPPLastChangeParser.h"
 
 const NSUInteger UPPEventServerPort = 54123;
diff --git a/CocoaUPnP/Events/UPPEventSubscriptionManager.m b/CocoaUPnP/Events/UPPEventSubscriptionManager.m
index 29efa5f..4cd23fc 100644
--- a/CocoaUPnP/Events/UPPEventSubscriptionManager.m
+++ b/CocoaUPnP/Events/UPPEventSubscriptionManager.m
@@ -1,6 +1,8 @@
 // CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 // Copyright 2015 Arcam. See LICENSE file.
 
+@import UIKit;
+
 #import "UPPEventSubscriptionManager.h"
 #import "UPPBasicService.h"
 #import "UPPEventSubscription.h"
diff --git a/CocoaUPnP/Models/UPPConstants.m b/CocoaUPnP/Models/UPPConstants.m
index e4fddfb..3b99f66 100644
--- a/CocoaUPnP/Models/UPPConstants.m
+++ b/CocoaUPnP/Models/UPPConstants.m
@@ -1,6 +1,8 @@
 // CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 // Copyright 2015 Arcam. See LICENSE file.
 
+@import Foundation;
+
 #import "UPPConstants.h"
 
 NSString * const UPPSOAPActionKey = @"SoapAction";
diff --git a/CocoaUPnP/Networking/SSDP/SSDPServiceBrowser.m b/CocoaUPnP/Networking/SSDP/SSDPServiceBrowser.m
index 7da8374..8e056c5 100644
--- a/CocoaUPnP/Networking/SSDP/SSDPServiceBrowser.m
+++ b/CocoaUPnP/Networking/SSDP/SSDPServiceBrowser.m
@@ -22,9 +22,11 @@
 //  Expanded for CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 //  Copyright 2015 Arcam. See LICENSE file.
 
+@import UIKit;
+
 #import "SSDPServiceBrowser.h"
 
-#import "GCDAsyncUdpSocket.h"
+#import <CocoaAsyncSocket/CocoaAsyncSocket.h>
 #import "SSDPService.h"
 
 #import <ifaddrs.h>
@@ -139,8 +141,8 @@ - (GCDAsyncUdpSocket *)unicastSocket
 {
     if (!_unicastSocket) {
         _unicastSocket = [[GCDAsyncUdpSocket alloc]
-                            initWithDelegate:self
-                            delegateQueue:dispatch_get_main_queue()];
+                          initWithDelegate:self
+                          delegateQueue:dispatch_get_main_queue()];
     }
     return _unicastSocket;
 }
diff --git a/CocoaUPnP/Parsers/UPPDeviceParser.m b/CocoaUPnP/Parsers/UPPDeviceParser.m
index 320f405..ffc5b35 100644
--- a/CocoaUPnP/Parsers/UPPDeviceParser.m
+++ b/CocoaUPnP/Parsers/UPPDeviceParser.m
@@ -1,13 +1,14 @@
 // CocoaUPnP by A&R Cambridge Ltd, http://www.arcam.co.uk
 // Copyright 2015 Arcam. See LICENSE file.
 
+#import <Ono/Ono.h>
+#import <AFNetworking/AFNetworking.h>
+
 #import "UPPDeviceParser.h"
 #import "UPPBasicDevice.h"
-#import "Ono.h"
 #import "UPPDeviceIcon.h"
 #import "UPPServiceDescription.h"
 #import "UPPError.h"
-#import "AFHTTPSessionManager.h"
 #import "UPPRequestSerializer.h"
 #import "UPPMediaRendererDevice.h"
 #import "UPPMediaServerDevice.h"
diff --git a/CocoaUPnP/Parsers/UPPErrorParser.m b/CocoaUPnP/Parsers/UPPErrorParser.m
index 92e244e..dec5be6 100644
--- a/CocoaUPnP/Parsers/UPPErrorParser.m
+++ b/CocoaUPnP/Parsers/UPPErrorParser.m
@@ -3,7 +3,7 @@
 
 #import "UPPErrorParser.h"
 #import "UPPError.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 
 @implementation UPPErrorParser
 
diff --git a/CocoaUPnP/Parsers/UPPLastChangeParser.m b/CocoaUPnP/Parsers/UPPLastChangeParser.m
index b73f186..487a980 100644
--- a/CocoaUPnP/Parsers/UPPLastChangeParser.m
+++ b/CocoaUPnP/Parsers/UPPLastChangeParser.m
@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPLastChangeParser.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 #import "UPPError.h"
 #import "UPPMediaItemParser.h"
 
@@ -50,7 +50,7 @@ + (void)parseData:(NSData *)data completion:(void (^)(NSDictionary *event, NSErr
             if (value.length == 0) {
                 value = [element stringValue];
             }
-            
+
             if (tag && value) {
                 responseDictionary[tag] = value;
             }
diff --git a/CocoaUPnP/Parsers/UPPMediaItemParser.m b/CocoaUPnP/Parsers/UPPMediaItemParser.m
index c698f4b..1e8bbdb 100644
--- a/CocoaUPnP/Parsers/UPPMediaItemParser.m
+++ b/CocoaUPnP/Parsers/UPPMediaItemParser.m
@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPMediaItemParser.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 #import "UPPMediaItem.h"
 #import "UPPMediaItemResource.h"
 #import "UPPError.h"
diff --git a/CocoaUPnP/Parsers/UPPResponseParser.m b/CocoaUPnP/Parsers/UPPResponseParser.m
index 5a521a3..e2e49c8 100644
--- a/CocoaUPnP/Parsers/UPPResponseParser.m
+++ b/CocoaUPnP/Parsers/UPPResponseParser.m
@@ -2,7 +2,7 @@
 // Copyright 2015 Arcam. See LICENSE file.
 
 #import "UPPResponseParser.h"
-#import "Ono.h"
+#import <Ono/Ono.h>
 #import "UPPError.h"
 #import "UPPMediaItemParser.h"
 
diff --git a/Info.plist b/Info.plist
new file mode 100644
index 0000000..d3de8ee
--- /dev/null
+++ b/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/README.md b/README.md
index 94b6583..08a9fea 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # CocoaUPnP
 
+[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![Build Status](https://travis-ci.org/arcam/CocoaUPnP.svg)](https://travis-ci.org/arcam/CocoaUPnP)
 [![Coverage Status](https://coveralls.io/repos/arcam/CocoaUPnP/badge.svg)](https://coveralls.io/r/arcam/CocoaUPnP)
 [![Pod Version](https://img.shields.io/cocoapods/v/CocoaUPnP.svg)](http://cocoadocs.org/docsets/CocoaUPnP/)
diff --git a/module.modulemap b/module.modulemap
new file mode 100644
index 0000000..20cddb1
--- /dev/null
+++ b/module.modulemap
@@ -0,0 +1,4 @@
+module CocoaUPnP {
+    umbrella header "Headers/CocoaUPnP.h"
+    requires objc_arc
+}
\ No newline at end of file
diff --git a/module.private.modulemap b/module.private.modulemap
new file mode 100644
index 0000000..3707a87
--- /dev/null
+++ b/module.private.modulemap
@@ -0,0 +1,4 @@
+explicit module CocoaUPnP.Private {
+    umbrella "PrivateHeaders"
+    requires objc_arc
+}
\ No newline at end of file