commit 3d4859f1b1b7aaa3a1be31699fc9cc9295662848
Author: Tobias Hieta <tobias@plexapp.com>
Date:   Tue Oct 13 11:05:27 2015 +0200

    Initial public commit of Plex Media Player

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..236ef64
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,47 @@
+---
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+ConstructorInitializerIndentWidth: 2
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+ColumnLimit:     100
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+DerivePointerBinding: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 60
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 1000
+PointerBindsToType: true
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: false
+Standard:        Cpp03
+IndentWidth:     2
+TabWidth:        2
+UseTab:          Never
+BreakBeforeBraces: Allman
+IndentFunctionDeclarationAfterType: false
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterControlStatementKeyword: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 0
+...
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e31eefb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+*.pro.user*
+dependencies/*
+CMakeLists.txt.user
+CMakeLists.txt.user.*
+build/*
+.idea
+.install_pkg
+.openelec-unpack
+QtCreatorDeployment.txt
+vagrant/ubuntu-x86_64/.vagrant
+vagrant/windows-x86_64/.vagrant
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..e69de29
diff --git a/BuildQT5-windows.md b/BuildQT5-windows.md
new file mode 100644
index 0000000..d2e30f5
--- /dev/null
+++ b/BuildQT5-windows.md
@@ -0,0 +1,41 @@
+# How-To build Qt 5.5.0 on Windows
+This procedure was ran on a freshly installed Win7 64 bits.
+
+This procedure assumes that the build root is `C:\qt\` but it can be changed in the beginning of each `.bat` file
+
+1. Install Visual Studio 2013
+- Install [Visual Studio 2013 Update 4](http://www.microsoft.com/fr-fr/download/details.aspx?id=44921) 
+- Install [Windows SDK 8](https://msdn.microsoft.com/en-us/windows/desktop/hh852363.aspx)
+- Install [ActivePerl](http://www.activestate.com/activeperl/downloads)
+- Install [Python 2.7.10](https://www.python.org/downloads/release/python-2710)
+- Install the following gnutools:
+  - [Bison](http://gnuwin32.sourceforge.net/downlinks/bison.php)
+  - [GPerf](http://gnuwin32.sourceforge.net/downlinks/gperf.php)
+  - [Flex](http://gnuwin32.sourceforge.net/downlinks/flex.php)
+- Grab [ICU sources](http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.zip) and unpack them in `C:\qt\icu`
+- Grab [Openssl 1.0.2d](https://www.openssl.org/source/) and unpack them in `C:\qt\openssl`
+- Grab [Qt Sources](http://download.qt.io/official_releases/qt/5.5/5.5.0/single/qt-everywhere-opensource-src-5.5.0.zip) and unpack them in  `C:\qt\qt5`
+- drop the three `.bat` files in the steps below in `C:\qt\` 
+- Open `C:\qt\icu\source\allionone\allinone.sln` with VS2013, you will be prompted for project conversion. Once the project is converted, just close it.
+- run `c:\qt\buildicu.bat`
+- run `c:\qt\buildopenssl.bat`
+- run `c:\qt\buildqt.bat`
+
+The qt build will land in `C:\qt\qt5\build`
+
+
+# buildicu.bat
+```
+set BUILD_ROOT=C:\qt

REM Set up \Microsoft Visual Studio 2013, where <arch> is \c amd64, \c x86, etc.
CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64

REM set compiler to multicore
set CL=/MP

REM Build icu
cd %BUILD_ROOT%\icu
msbuild source\allinone\allinone.sln /m /target:Build /property:Configuration=Release;Platform=x64
msbuild source\allinone\allinone.sln /m /target:Build /property:Configuration=Debug;Platform=x64
+cd ..
+```
+
+# buildopenssl.bat
+```
+set BUILD_ROOT=C:\qt

CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64

cd openssl
set CL=/MP
perl Configure VC-WIN64A --prefix=%BUILD_ROOT%\openssl\build
call ms\do_win64a
nmake -f ms\ntdll.mak
nmake -f ms\ntdll.mak install
cd ..
+```
+
+# buildqt.bat
+```
+set BUILD_ROOT=C:\qt


REM Set up \Microsoft Visual Studio 2013, where <arch> is \c amd64, \c x86, etc.
CALL "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86_amd64

REM set compiler to multicore
set CL=/MP

REM Add ICU dirs to the proper path (include, libs , bin)
set INCLUDE=%INCLUDE%;%BUILD_ROOT%\icu\include
set LIB=%LIB%;%BUILD_ROOT%\icu\lib64
set PATH=%PATH%;%BUILD_ROOT%\icu\bin64


REM Add OpenSSL dirs to the proper path (include, libs , bin)
set INCLUDE=%INCLUDE%;%BUILD_ROOT%\openssl\build\include
set LIB=%LIB%;%BUILD_ROOT%\openssl\build\lib
set PATH=%PATH%;%BUILD_ROOT%\openssl\build\bin

REM Add Pyhton dirs to the proper path (include, libs , bin)
set PATH=%PATH%;c:\Python27\


REM Add GunWindirs to the proper path (include, libs , bin)
set INCLUDE=%INCLUDE%;%BUILD_ROOT%\GnuWin32\include
set LIB=%LIB%;%BUILD_ROOT%\GnuWin32\lib
set PATH=%PATH%;=%BUILD_ROOT%\GnuWin32\bin


SET QT_ROOT=%BUILD_ROOT%\qt5
SET PATH=%QT_ROOT%\qtbase\bin;%PATH%
SET QMAKESPEC=win32-msvc2013

cd %QT_ROOT%

CALL configure -prefix %QT_ROOT%\build -icu -opengl dynamic -release -nomake examples -opensource -confirm-license  -no-gif  -qt-libpng -qt-libjpeg -openssl -qt-pcre -no-cups -no-dbus -skip qtwebkit -skip qtconnectivity -skip qtdoc -skip qtgraphicaleffects -skip qtmultimedia -skip qtsensors -skip qtserialport -skip qtwebkit-examples -skip qtquick1 -skip qt3d

nmake
nmake install
cd ..
+```
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..48eba22
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,59 @@
+project(PlexMediaPlayer CXX C)
+cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
+
+cmake_policy(SET CMP0020 NEW)
+if (POLICY CMP0058)
+cmake_policy(SET CMP0058 NEW)
+endif()
+cmake_policy(SET CMP0017 NEW)
+
+option(OPENELEC "Make an OpenELEC build" OFF)
+
+if (OPENELEC)
+  add_definitions(-DKONVERGO_OPENELEC=1)
+  Message(STATUS "Making an OpenELEC build")
+endif(OPENELEC)
+
+option(BUILD_TARGET "Destination target for the build" "")
+
+if (BUILD_TARGET STREQUAL "RPI")
+  add_definitions(-DTARGET_RPI=1)
+  set(RPI_LIBS bcm_host)
+  Message(STATUS "Build for Raspberry PI target")
+endif(BUILD_TARGET STREQUAL "RPI")
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMakeModules/")
+set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME Core)
+
+add_definitions(-DQS_LOG_LINE_NUMBERS -DQHTTPSERVER_EXPORT)
+
+include(DependencyConfiguration)
+include(VersionConfiguration)
+include(NameConfiguration)
+include(utils)
+include(QtConfiguration)
+include(PlayerConfiguration)
+include(InputConfiguration)
+include(FindBreakpad)
+include(BreakpadSymbols)
+
+if(APPLE)
+  include(AppleConfiguration)
+elseif(WIN32)
+  include(Win32Configuration)
+elseif(UNIX AND (NOT APPLE))
+  include(LinuxConfiguration)
+endif(APPLE)
+
+if(CMAKE_COMPILER_IS_GNUCC)
+  include(GCCConfiguration)
+endif(CMAKE_COMPILER_IS_GNUCC)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNINGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNINGS}")
+
+add_subdirectory(external)
+add_subdirectory(src)
+
+include(CPackConfiguration)
diff --git a/CMakeModules/AppleConfiguration.cmake b/CMakeModules/AppleConfiguration.cmake
new file mode 100644
index 0000000..98a6afe
--- /dev/null
+++ b/CMakeModules/AppleConfiguration.cmake
@@ -0,0 +1,21 @@
+find_library(FOUNDATION Foundation)
+find_library(APPKIT AppKit)
+find_library(IOKIT IOKit)
+find_library(COCOA Cocoa)
+find_Library(CARBON Carbon)
+find_library(SECURITY Security)
+
+set(OS_LIBS ${FOUNDATION} ${APPKIT} ${IOKIT} ${COCOA} ${SECURITY} ${CARBON} spmediakeytap)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.9")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.9")
+set(WARNINGS "-Wall")
+
+set(HAVE_UPDATER 1)
+find_program(UPDATER_PATH updater HINTS ${CMAKE_FIND_ROOT_PATH}/update_installer/ NO_DEFAULT_PATH)
+if(${UPDATER_PATH} MATCHES "UPDATER_PATH-NOTFOUND")
+  set(HAVE_UPDATER 0)
+  message(STATUS "will build without the updater")
+endif(${UPDATER_PATH} MATCHES "UPDATER_PATH-NOTFOUND")
+
+set(INSTALL_BIN_DIR .)
+set(INSTALL_RESOURCE_DIR Contents/Resources)
diff --git a/CMakeModules/BreakpadSymbols.cmake b/CMakeModules/BreakpadSymbols.cmake
new file mode 100644
index 0000000..68cd9be
--- /dev/null
+++ b/CMakeModules/BreakpadSymbols.cmake
@@ -0,0 +1,35 @@
+OPTION(GENERATE_SYMBOLS "Should we generate symbols for binaries?" ON)
+function(dumpsyms target symfile)
+  find_program(DUMP_SYMS dump_syms HINTS /usr/bin/ ${DEPENDENCY_ROOT}/bin)
+  if(GENERATE_SYMBOLS AND NOT DUMP_SYMS)
+    message(STATUS "dump_syms not found")
+  endif()
+  if(GENERATE_SYMBOLS AND DUMP_SYMS)
+
+    if(APPLE)
+      add_custom_command(TARGET ${target} POST_BUILD
+        COMMAND dsymutil -o ${MAIN_NAME}.dSYM $<TARGET_FILE:${MAIN_TARGET}>
+        COMMENT Generating ${MAIN_NAME}.dSYM
+        BYPRODUCTS ${MAIN_NAME}.dSYM/Contents/Resources/DWARF/${target} ${MAIN_NAME}.dSYM/Contents/Info.plist
+      )
+    endif(APPLE)
+
+    unset(COMPRESS)
+    find_program(COMPRESS_XZ xz)
+    find_program(COMPRESS_BZ bzip2)
+    if(COMPRESS_XZ)
+      set(COMPRESS_EXT xz)
+      set(COMPRESS ${COMPRESS_XZ})
+    elseif(COMPRESS_BZ)
+      set(COMPRESS_EXT bz2)
+      set(COMPRESS ${COMPRESS_BZ})
+    endif(COMPRESS_XZ)
+
+    add_custom_command(
+      TARGET ${target} POST_BUILD
+      BYPRODUCTS ${symfile}.${COMPRESS_EXT}
+      COMMAND ${CMAKE_SOURCE_DIR}/scripts/dump-syms.sh "${DUMP_SYMS}" "${COMPRESS}" "$<TARGET_FILE:${target}>" "${symfile}.${COMPRESS_EXT}"
+    )
+    install(FILES ${symfile}.${COMPRESS_EXT} DESTINATION ${CMAKE_BINARY_DIR})
+  endif(GENERATE_SYMBOLS AND DUMP_SYMS)
+endfunction()
diff --git a/CMakeModules/CPackConfiguration.cmake b/CMakeModules/CPackConfiguration.cmake
new file mode 100644
index 0000000..8102d87
--- /dev/null
+++ b/CMakeModules/CPackConfiguration.cmake
@@ -0,0 +1,63 @@
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Plex Media Player")
+set(CPACK_PACKAGE_VENDOR "Plex")
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_NANO})
+
+if(APPLE)
+  set(CPACK_SYSTEM_NAME "macosx-x86_64")
+elseif(WIN32)
+  set(CPACK_SYSTEM_NAME "windows-x86")
+else()
+  set(CPACK_SYSTEM_NAME linux-${CMAKE_HOST_SYSTEM_PROCESSOR})
+endif()
+set(CPACK_PACKAGE_FILE_NAME "PlexMediaPlayer-${VERSION_STRING}-${CPACK_SYSTEM_NAME}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "PlexMediaPlayer-${VERSION_STRING}-src")
+
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "PlexMediaPlayer")
+set(CPACK_STRIP_FILES 1)
+
+set(CPACK_GENERATOR "ZIP")
+
+if(WIN32)
+	list(APPEND CPACK_GENERATOR "IFW")
+endif(WIN32)
+
+# config IFW
+set(CPACK_IFW_FRAMEWORK_VERSION 2.0.1)
+set(CPACK_IFW_PACKAGE_NAME "Plex Media Player")
+set(CPACK_IFW_PACKAGE_START_MENU_DIRECTORY "Plex Media Player")
+set(CPACK_IFW_PACKAGE_TITLE "Plex Media Player Installer")
+set(CPACK_IFW_PACKAGE_PUBLISHER "Plex")
+set(CPACK_IFW_PRODUCT_URL "https://plex.tv")
+set(CPACK_IFW_PACKAGE_ICON ${CMAKE_SOURCE_DIR}/bundle/win/Plex.ico)
+set(CPACK_IFW_PACKAGE_WINDOW_ICON ${CMAKE_SOURCE_DIR}/resources/images/icon.png)
+
+if(APPLE)
+  set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
+endif(APPLE)
+
+configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/CPackGeneratedConfig.cmake.in ${CMAKE_BINARY_DIR}/CPackGeneratedConfig.cmake)
+set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/CPackGeneratedConfig.cmake)
+
+include(CPack)
+
+cpack_add_component(Core DISPLAY_NAME "Plex Media Player" DESCRIPTION "Plex Media Player (Core Application)" REQUIRED)
+
+if(WIN32)
+  FILE(TO_CMAKE_PATH ${DEPENDENCY_ROOT} tmp)
+  install(FILES ${tmp}/bin/mpv-1.dll DESTINATION .)
+  install(FILES ${tmp}/lib/SDL2.dll DESTINATION .)
+  install(FILES ${tmp}/lib/libcec.dll DESTINATION .)
+  if(IS_DIRECTORY ${CMAKE_BINARY_DIR}/extradlls)
+    file(GLOB EXTRADLLS ${CMAKE_BINARY_DIR}/extradlls/*.dll)
+    install(FILES ${EXTRADLLS} DESTINATION .)
+  endif()
+  install(FILES ${CMAKE_SOURCE_DIR}/bundle/win/qt.conf DESTINATION .)
+  install(FILES ${CMAKE_SOURCE_DIR}/bundle/win/PlexMediaPlayer-angle.bat DESTINATION .)
+  #add_custom_command(TARGET package POST_BUILD COMMAND ${CMAKE_SOURCE_DIR}/scripts/WindowsSign.cmd  ${CPACK_PACKAGE_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.exe WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
+  # group/component configuration
+  message(STATUS configure IFW)
+  include(CPackIFW)
+  cpack_ifw_configure_component(Core PRIORITY 1 SCRIPT ${CMAKE_SOURCE_DIR}/bundle/win/shortcut.qs)
+endif(WIN32)
\ No newline at end of file
diff --git a/CMakeModules/CPackGeneratedConfig.cmake.in b/CMakeModules/CPackGeneratedConfig.cmake.in
new file mode 100644
index 0000000..91d617e
--- /dev/null
+++ b/CMakeModules/CPackGeneratedConfig.cmake.in
@@ -0,0 +1,3 @@
+if(CPACK_GENERATOR MATCHES "IFW")
+  set(CMAKE_EXECUTABLE_SUFFIX ".exe")
+endif()
diff --git a/CMakeModules/CompleteBundle.cmake b/CMakeModules/CompleteBundle.cmake
new file mode 100644
index 0000000..949577d
--- /dev/null
+++ b/CMakeModules/CompleteBundle.cmake
@@ -0,0 +1,17 @@
+if(APPLE)
+  set(SCRIPT CompleteBundleOSX)
+elseif(WIN32)
+  set(SCRIPT CompleteBundleWin)
+endif(APPLE)
+
+option(CODE_SIGN "code sign the app" OFF)
+if(CODE_SIGN)
+  set(DO_SIGN 1)
+else(CODE_SIGN)
+  set(DO_SIGN 0)
+endif(CODE_SIGN)
+
+if(SCRIPT)
+  configure_file(${CMAKE_SOURCE_DIR}/CMakeModules/${SCRIPT}.cmake.in ${SCRIPT}.cmake @ONLY)
+  install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPT}.cmake)
+endif(SCRIPT)
diff --git a/CMakeModules/CompleteBundleOSX.cmake.in b/CMakeModules/CompleteBundleOSX.cmake.in
new file mode 100644
index 0000000..e9bf052
--- /dev/null
+++ b/CMakeModules/CompleteBundleOSX.cmake.in
@@ -0,0 +1,69 @@
+set(app "@EXE@")
+
+list(APPEND BINS "Contents/Resources/updater")
+list(APPEND BINS "Contents/Resources/@HELPER_NAME@")
+
+set(args ${app})
+list(APPEND args "-verbose=2")
+list(APPEND args "-qmldir=@SOURCE_ROOT@/src/ui")
+foreach(BIN ${BINS})
+  list(APPEND args "-executable=${app}/${BIN}")
+endforeach(BIN ${BINS})
+
+execute_process(
+  COMMAND @QTROOT@/bin/macdeployqt ${args}
+  WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
+)
+
+#set(ENTITLEMENTS --entitlements @SOURCE_ROOT@/bundle/osx/Konvergo.entitlements)
+set(CODESIGN codesign ${ENTITLEMENTS} --force --sign "Developer ID Application: Plex Inc.")
+
+macro(sign_binary BIN)
+  message(STATUS "Signing: ${BIN}")
+  execute_process(
+    COMMAND ${CODESIGN} "${BIN}"
+    RESULT_VARIABLE result
+  )
+  if(NOT ${result} EQUAL 0)
+    message(FATAL_ERROR "Failed to sign ${BIN}")
+  endif(NOT ${result} EQUAL 0)
+endmacro(sign_binary BIN)
+
+if(@DO_SIGN@)
+
+  # we need to sign the webengine helper before the framework
+  # add --entitlements @SOURCE_ROOT@/bundle/osx/WebEngine.entitlements when we want to sandbox
+  set(WEB_PROC "${CMAKE_INSTALL_PREFIX}/${app}/Contents/Frameworks/QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app")
+  sign_binary(${WEB_PROC})
+
+  file(GLOB_RECURSE LIBS
+    FOLLOW_SYMLINKS
+    "${CMAKE_INSTALL_PREFIX}/${app}/*.dylib"
+  )
+  file(GLOB FRAMEWORKS FOLLOW_SYMLINKS LIST_DIRECTORIES true "${CMAKE_INSTALL_PREFIX}/${app}/Contents/Frameworks/*")
+  foreach(LIB ${LIBS} ${FRAMEWORKS})
+    sign_binary(${LIB})
+  endforeach(LIB ${LIBS})
+
+  foreach(BIN ${BINS})
+    sign_binary(${CMAKE_INSTALL_PREFIX}/${app}/${BIN})
+  endforeach(BIN ${BINS})
+
+  sign_binary(${CMAKE_INSTALL_PREFIX}/${app})
+
+  message("Verifing signature")
+  execute_process(
+    COMMAND codesign --verbose=4 --verify "${CMAKE_INSTALL_PREFIX}/@EXE@"
+    RESULT_VARIABLE result
+  )
+  if(NOT ${result} EQUAL 0)
+    message(FATAL_ERROR "Failed to verify binary!")
+  endif(NOT ${result} EQUAL 0)
+  execute_process(
+    COMMAND spctl --verbose=4 --assess --type execute "${CMAKE_INSTALL_PREFIX}/@EXE@"
+    RESULT_VARIABLE result
+  )
+  if(NOT ${result} EQUAL 0)
+    message(FATAL_ERROR "Failed to verify binary!")
+  endif(NOT ${result} EQUAL 0)
+endif(@DO_SIGN@)
\ No newline at end of file
diff --git a/CMakeModules/CompleteBundleWin.cmake.in b/CMakeModules/CompleteBundleWin.cmake.in
new file mode 100644
index 0000000..8abe8a6
--- /dev/null
+++ b/CMakeModules/CompleteBundleWin.cmake.in
@@ -0,0 +1,10 @@
+execute_process(COMMAND @QTROOT@/bin/windeployqt.exe --qmldir @SOURCE_ROOT@/src/ui ${CMAKE_INSTALL_PREFIX}/PlexMediaPlayer.exe)
+
+if(@DO_SIGN@)
+  file(GLOB_RECURSE EXES ${CMAKE_INSTALL_PREFIX}/*.exe ${CMAKE_INSTALL_PREFIX}/*.dll)
+  set(ENV{errorlevel} 1)
+  foreach(e ${EXES})
+    message("-- Signing: ${CMAKE_SOURCE_DIR}/scripts/WindowsSign.cmd ${e}")
+    execute_process(COMMAND ${CMAKE_SOURCE_DIR}/scripts/WindowsSign.cmd "${e}" RESULT_VARIABLE RES)
+  endforeach()
+endif()
\ No newline at end of file
diff --git a/CMakeModules/DependencyConfiguration.cmake b/CMakeModules/DependencyConfiguration.cmake
new file mode 100644
index 0000000..639e4cc
--- /dev/null
+++ b/CMakeModules/DependencyConfiguration.cmake
@@ -0,0 +1,28 @@
+find_package(PkgConfig)
+option(DISABLE_BUNDLED_DEPS "Disable the bundled deps on certain platforms" OFF)
+
+if(APPLE AND NOT DISABLE_BUNDLED_DEPS)
+  set(DEFAULT_ROOT "${CMAKE_SOURCE_DIR}/dependencies/konvergo-depends-darwin-x86_64-release")
+  set(DEPENDENCY_ROOT ${DEFAULT_ROOT} CACHE PATH "Path where the deps are located")
+endif(APPLE AND NOT DISABLE_BUNDLED_DEPS)
+
+if(DEPENDENCY_ROOT)
+  message(STATUS "Going to use bundled deps in directory: ${DEPENDENCY_ROOT}")
+  set(CMAKE_FIND_ROOT_PATH ${DEPENDENCY_ROOT})
+  set(CMAKE_PREFIX_PATH ${DEPENDENCY_ROOT})
+  set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_FIND_ROOT_PATH}/lib/pkgconfig)
+  set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
+  include_directories(${CMAKE_FIND_ROOT_PATH}/include)
+else(DEPENDENCY_ROOT)
+  message(STATUS "Not using bundled deps")
+endif(DEPENDENCY_ROOT)
+
+find_package(Threads)
+
+# on windows we need to download the updater binary seperately
+if(WIN32)
+  file(DOWNLOAD https://nightlies.plex.tv/directdl/plex-dependencies/konvergo-qt/updater.exe ${CMAKE_BINARY_DIR}/updater.exe
+       SHOW_PROGRESS
+       EXPECTED_HASH SHA1=d3b4f70d6542fa42c8edd2b9b93fd0916bf20f07
+       TLS_VERIFY OFF)
+endif(WIN32)
\ No newline at end of file
diff --git a/CMakeModules/FindBreakpad.cmake b/CMakeModules/FindBreakpad.cmake
new file mode 100644
index 0000000..a7e0b50
--- /dev/null
+++ b/CMakeModules/FindBreakpad.cmake
@@ -0,0 +1,69 @@
+###############################################################################
+# CMake module to search for the mpv libraries.
+#
+# WARNING: This module is experimental work in progress.
+#
+# Based one FindVLC.cmake by:
+# Copyright (c) 2011 Michael Jansen <info@michael-jansen.biz>
+# Modified by Tobias Hieta <tobias@hieta.se>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+###############################################################################
+
+#
+### Global Configuration Section
+#
+SET(_BREAKPAD_REQUIRED_VARS BREAKPAD_INCLUDE_DIR BREAKPAD_LIBRARY)
+
+#
+### BREAKPAD uses pkgconfig.
+#
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_BREAKPAD QUIET breakpad-client)
+endif(PKG_CONFIG_FOUND)
+
+#
+### Look for the include files.
+#
+find_path(
+    BREAKPAD_INCLUDE_DIR
+    NAMES google_breakpad/common/breakpad_types.h
+    PATH_SUFFIXES breakpad
+    HINTS
+        ${PC_BREAKPAD_INCLUDEDIR}
+        ${PC_BREAKPAD_INCLUDE_DIRS} # Unused for BREAKPAD but anyway
+    DOC "BREAKPAD include directory"
+    )
+mark_as_advanced(BREAKPAD_INCLUDE_DIR)
+set(BREAKPAD_INCLUDE_DIRS ${BREAKPAD_INCLUDE_DIR})
+
+#
+### Look for the libraries (BREAKPAD and BREAKPADsore)
+#
+find_library(
+    BREAKPAD_LIBRARY
+    NAMES breakpad_client
+    HINTS
+        ${PC_BREAKPAD_LIBDIR}
+        ${PC_BREAKPAD_LIBRARY_DIRS} # Unused for BREAKPAD but anyway
+    PATH_SUFFIXES lib${LIB_SUFFIX}
+    )
+get_filename_component(_BREAKPAD_LIBRARY_DIR ${BREAKPAD_LIBRARY} PATH)
+mark_as_advanced(BREAKPAD_LIBRARY)
+
+set(BREAKPAD_LIBRARY_DIRS _BREAKPAD_CORE_LIBRARY_DIR _BREAKPAD_LIBRARY_DIR)
+list(REMOVE_DUPLICATES BREAKPAD_LIBRARY_DIRS)
+mark_as_advanced(BREAKPAD_LIBRARY_DIRS)
+
+#
+### Check if everything was found and if the version is sufficient.
+#
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    BREAKPAD
+    REQUIRED_VARS ${_BREAKPAD_REQUIRED_VARS}
+    VERSION_VAR BREAKPAD_VERSION_STRING
+    )
+
diff --git a/CMakeModules/FindCEC.cmake b/CMakeModules/FindCEC.cmake
new file mode 100644
index 0000000..2c71c07
--- /dev/null
+++ b/CMakeModules/FindCEC.cmake
@@ -0,0 +1,26 @@
+if(CEC_INCLUDE_DIR)
+  # Already in cache, be silent
+  set(CEC_FIND_QUIETLY TRUE)
+endif(CEC_INCLUDE_DIR)
+
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(_CEC QUIET libcec>=2.0)
+endif (PKG_CONFIG_FOUND)
+
+Find_Path(CEC_INCLUDE_DIR
+  NAMES cec.h
+  PATHS /usr/include usr/local/include 
+  PATH_SUFFIXES libcec
+  HINTS ${_CEC_INCLUDEDIR}
+)
+
+Find_Library(CEC_LIBRARY
+  NAMES cec
+  PATHS /usr/lib usr/local/lib
+  HINTS ${_CEC_LIBDIR}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CEC DEFAULT_MSG CEC_LIBRARY CEC_INCLUDE_DIR)
+
+
diff --git a/CMakeModules/FindDL.cmake b/CMakeModules/FindDL.cmake
new file mode 100644
index 0000000..8d1df7b
--- /dev/null
+++ b/CMakeModules/FindDL.cmake
@@ -0,0 +1,17 @@
+# - find where dlopen and friends are located.
+# DL_FOUND - system has dynamic linking interface available
+# DL_INCLUDE_DIR - where dlfcn.h is located.
+# DL_LIBRARIES - libraries needed to use dlopen
+
+include(CheckFunctionExists)
+
+find_path(DL_INCLUDE_DIR NAMES dlfcn.h)
+find_library(DL_LIBRARIES NAMES dl)
+if(DL_LIBRARIES)
+  set(DL_FOUND)
+else(DL_LIBRARIES)
+  check_function_exists(dlopen DL_FOUND)
+  # If dlopen can be found without linking in dl then dlopen is part
+  # of libc, so don't need to link extra libs.
+  set(DL_LIBRARIES "")
+endif(DL_LIBRARIES)
diff --git a/CMakeModules/FindGLES2.cmake b/CMakeModules/FindGLES2.cmake
new file mode 100644
index 0000000..d643e8a
--- /dev/null
+++ b/CMakeModules/FindGLES2.cmake
@@ -0,0 +1,73 @@
+# Copyright (c) 2012, Guillermo A. Amaral B. (gamaral) <g@maral.me>.
+# All rights reserved.
+#
+# This file is part of Marshmallow Game Engine.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#
+#    2. Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# The views and conclusions contained in the software and documentation are
+# those of the authors and should not be interpreted as representing official
+# policies, either expressed or implied, of the project as a whole.
+#
+###############################################################################
+# Find GLES2
+###############################################################################
+#
+#  GLES2_FOUND
+#  GLES2_INCLUDE_DIR
+#  GLES2_LIBRARY
+#
+###############################################################################
+
+find_path(GLES2_INCLUDE_DIR GLES2/gl2.h
+	HINTS $ENV{GLES2DIR}
+	PATH_SUFFIXES include
+	PATHS ~/Library/Frameworks
+	      /Library/Frameworks
+	      /usr/local
+	      /usr
+	      /usr/X11R6
+	      /opt/local
+	      /opt/vc
+	      /opt
+)
+
+find_library(GLES2_LIBRARY
+	GLESv2
+	HINTS $ENV{GLES2DIR}
+	PATH_SUFFIXES lib64 lib
+	PATHS ~/Library/Frameworks
+	      /Library/Frameworks
+	      /usr/local
+	      /usr
+	      /usr/X11R6
+	      /opt/local
+	      /opt/vc
+	      /opt
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLES2 DEFAULT_MSG GLES2_LIBRARY)
+
+mark_as_advanced(GLES2_LIBRARY GLES2_INCLUDE_DIR)
+
+set(OPENGL_FOUND ${GLES2_FOUND})
diff --git a/CMakeModules/FindICU.cmake b/CMakeModules/FindICU.cmake
new file mode 100644
index 0000000..c246bb6
--- /dev/null
+++ b/CMakeModules/FindICU.cmake
@@ -0,0 +1,311 @@
+# This module can find the International Components for Unicode (ICU) Library
+#
+# Requirements:
+# - CMake >= 2.8.3 (for new version of find_package_handle_standard_args)
+#
+# The following variables will be defined for your use:
+#   - ICU_FOUND             : were all of your specified components found (include dependencies)?
+#   - ICU_INCLUDE_DIRS      : ICU include directory
+#   - ICU_LIBRARIES         : ICU libraries
+#   - ICU_VERSION           : complete version of ICU (x.y.z)
+#   - ICU_MAJOR_VERSION     : major version of ICU
+#   - ICU_MINOR_VERSION     : minor version of ICU
+#   - ICU_PATCH_VERSION     : patch version of ICU
+#   - ICU_<COMPONENT>_FOUND : were <COMPONENT> found? (FALSE for non specified component if it is not a dependency)
+#
+# For windows or non standard installation, define ICU_ROOT variable to point to the root installation of ICU. Two ways:
+#   - run cmake with -DICU_ROOT=<PATH>
+#   - define an environment variable with the same name before running cmake
+# With cmake-gui, before pressing "Configure":
+#   1) Press "Add Entry" button
+#   2) Add a new entry defined as:
+#     - Name: ICU_ROOT
+#     - Type: choose PATH in the selection list
+#     - Press "..." button and select the root installation of ICU
+#
+# Example Usage:
+#
+#   1. Copy this file in the root of your project source directory
+#   2. Then, tell CMake to search this non-standard module in your project directory by adding to your CMakeLists.txt:
+#     set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+#   3. Finally call find_package() once, here are some examples to pick from
+#
+#   Require ICU 4.4 or later
+#     find_package(ICU 4.4 REQUIRED)
+#
+#   if(ICU_FOUND)
+#      include_directories(${ICU_INCLUDE_DIRS})
+#      add_executable(myapp myapp.c)
+#      target_link_libraries(myapp ${ICU_LIBRARIES})
+#   endif(ICU_FOUND)
+
+#=============================================================================
+# Copyright (c) 2011-2013, julp
+#
+# Distributed under the OSI-approved BSD License
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#=============================================================================
+
+########## Private ##########
+if(NOT DEFINED ICU_PUBLIC_VAR_NS)
+    set(ICU_PUBLIC_VAR_NS "ICU")                          # Prefix for all ICU relative public variables
+endif(NOT DEFINED ICU_PUBLIC_VAR_NS)
+if(NOT DEFINED ICU_PRIVATE_VAR_NS)
+    set(ICU_PRIVATE_VAR_NS "_${ICU_PUBLIC_VAR_NS}")       # Prefix for all ICU relative internal variables
+endif(NOT DEFINED ICU_PRIVATE_VAR_NS)
+if(NOT DEFINED PC_ICU_PRIVATE_VAR_NS)
+    set(PC_ICU_PRIVATE_VAR_NS "_PC${ICU_PRIVATE_VAR_NS}") # Prefix for all pkg-config relative internal variables
+endif(NOT DEFINED PC_ICU_PRIVATE_VAR_NS)
+
+function(icudebug _VARNAME)
+    if(${ICU_PUBLIC_VAR_NS}_DEBUG)
+        if(DEFINED ${ICU_PUBLIC_VAR_NS}_${_VARNAME})
+            message("${ICU_PUBLIC_VAR_NS}_${_VARNAME} = ${${ICU_PUBLIC_VAR_NS}_${_VARNAME}}")
+        else(DEFINED ${ICU_PUBLIC_VAR_NS}_${_VARNAME})
+            message("${ICU_PUBLIC_VAR_NS}_${_VARNAME} = <UNDEFINED>")
+        endif(DEFINED ${ICU_PUBLIC_VAR_NS}_${_VARNAME})
+    endif(${ICU_PUBLIC_VAR_NS}_DEBUG)
+endfunction(icudebug)
+
+set(${ICU_PRIVATE_VAR_NS}_ROOT "")
+if(DEFINED ENV{ICU_ROOT})
+    set(${ICU_PRIVATE_VAR_NS}_ROOT "$ENV{ICU_ROOT}")
+endif(DEFINED ENV{ICU_ROOT})
+if (DEFINED ICU_ROOT)
+    set(${ICU_PRIVATE_VAR_NS}_ROOT "${ICU_ROOT}")
+endif(DEFINED ICU_ROOT)
+
+set(${ICU_PRIVATE_VAR_NS}_BIN_SUFFIXES )
+set(${ICU_PRIVATE_VAR_NS}_LIB_SUFFIXES )
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    list(APPEND ${ICU_PRIVATE_VAR_NS}_BIN_SUFFIXES "bin64")
+    list(APPEND ${ICU_PRIVATE_VAR_NS}_LIB_SUFFIXES "lib64")
+endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+list(APPEND ${ICU_PRIVATE_VAR_NS}_BIN_SUFFIXES "bin")
+list(APPEND ${ICU_PRIVATE_VAR_NS}_LIB_SUFFIXES "lib")
+
+set(${ICU_PRIVATE_VAR_NS}_COMPONENTS )
+# <icu component name> <library name 1> ... <library name N>
+macro(icu_declare_component _NAME)
+    list(APPEND ${ICU_PRIVATE_VAR_NS}_COMPONENTS ${_NAME})
+    set("${ICU_PRIVATE_VAR_NS}_COMPONENTS_${_NAME}" ${ARGN})
+endmacro(icu_declare_component)
+
+icu_declare_component(data icudata)
+icu_declare_component(uc   icuuc)         # Common and Data libraries
+icu_declare_component(i18n icui18n icuin) # Internationalization library
+icu_declare_component(io   icuio ustdio)  # Stream and I/O Library
+icu_declare_component(le   icule)         # Layout library
+icu_declare_component(lx   iculx)         # Paragraph Layout library
+
+########## Public ##########
+set(${ICU_PUBLIC_VAR_NS}_FOUND TRUE)
+set(${ICU_PUBLIC_VAR_NS}_LIBRARIES )
+set(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS )
+set(${ICU_PUBLIC_VAR_NS}_C_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CXX_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CPP_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_C_SHARED_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CXX_SHARED_FLAGS "")
+set(${ICU_PUBLIC_VAR_NS}_CPP_SHARED_FLAGS "")
+foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PRIVATE_VAR_NS}_COMPONENTS})
+    string(TOUPPER "${${ICU_PRIVATE_VAR_NS}_COMPONENT}" ${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT)
+    set("${ICU_PUBLIC_VAR_NS}_${${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT}_FOUND" FALSE) # may be done in the icu_declare_component macro
+endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+
+# Check components
+if(NOT ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS) # uc required at least
+    set(${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS uc)
+else(NOT ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+    list(APPEND ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS uc)
+    list(REMOVE_DUPLICATES ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+    foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS})
+        if(NOT DEFINED ${ICU_PRIVATE_VAR_NS}_COMPONENTS_${${ICU_PRIVATE_VAR_NS}_COMPONENT})
+            message(FATAL_ERROR "Unknown ICU component: ${${ICU_PRIVATE_VAR_NS}_COMPONENT}")
+        endif(NOT DEFINED ${ICU_PRIVATE_VAR_NS}_COMPONENTS_${${ICU_PRIVATE_VAR_NS}_COMPONENT})
+    endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+endif(NOT ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+
+# Includes
+find_path(
+    ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS
+    NAMES unicode/utypes.h utypes.h
+    HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT}
+    PATH_SUFFIXES "include"
+    DOC "Include directories for ICU"
+)
+
+if(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+    ########## <part to keep synced with tests/version/CMakeLists.txt> ##########
+    if(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uvernum.h") # ICU >= 4
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uvernum.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    elseif(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uversion.h") # ICU [2;4[
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/uversion.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    elseif(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/utypes.h") # ICU [1.4;2[
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/unicode/utypes.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    elseif(EXISTS "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/utypes.h") # ICU 1.3
+        file(READ "${${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS}/utypes.h" ${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS)
+    else()
+        message(FATAL_ERROR "ICU version header not found")
+    endif()
+
+    if(${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS MATCHES ".*# *define *ICU_VERSION *\"([0-9]+)\".*") # ICU 1.3
+        # [1.3;1.4[ as #define ICU_VERSION "3" (no patch version, ie all 1.3.X versions will be detected as 1.3.0)
+        set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "1")
+        set(${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${CMAKE_MATCH_1}")
+        set(${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "0")
+    elseif(${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS MATCHES ".*# *define *U_ICU_VERSION_MAJOR_NUM *([0-9]+).*")
+        #
+        # Since version 4.9.1, ICU release version numbering was totaly changed, see:
+        # - http://site.icu-project.org/download/49
+        # - http://userguide.icu-project.org/design#TOC-Version-Numbers-in-ICU
+        #
+        set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "${CMAKE_MATCH_1}")
+        string(REGEX REPLACE ".*# *define *U_ICU_VERSION_MINOR_NUM *([0-9]+).*" "\\1" ${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS}")
+        string(REGEX REPLACE ".*# *define *U_ICU_VERSION_PATCHLEVEL_NUM *([0-9]+).*" "\\1" ${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "${${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS}")
+    elseif(${ICU_PRIVATE_VAR_NS}_VERSION_HEADER_CONTENTS MATCHES ".*# *define *U_ICU_VERSION *\"(([0-9]+)(\\.[0-9]+)*)\".*") # ICU [1.4;1.8[
+        # [1.4;1.8[ as #define U_ICU_VERSION "1.4.1.2" but it seems that some 1.4.1(?:\.\d)? have releasing error and appears as 1.4.0
+        set(${ICU_PRIVATE_VAR_NS}_FULL_VERSION "${CMAKE_MATCH_1}") # copy CMAKE_MATCH_1, no longer valid on the following if
+        if(${ICU_PRIVATE_VAR_NS}_FULL_VERSION MATCHES "^([0-9]+)\\.([0-9]+)$")
+            set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "${CMAKE_MATCH_1}")
+            set(${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${CMAKE_MATCH_2}")
+            set(${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "0")
+        elseif(${ICU_PRIVATE_VAR_NS}_FULL_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+            set(${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION "${CMAKE_MATCH_1}")
+            set(${ICU_PUBLIC_VAR_NS}_MINOR_VERSION "${CMAKE_MATCH_2}")
+            set(${ICU_PUBLIC_VAR_NS}_PATCH_VERSION "${CMAKE_MATCH_3}")
+        endif()
+    else()
+        message(FATAL_ERROR "failed to detect ICU version")
+    endif()
+    set(${ICU_PUBLIC_VAR_NS}_VERSION "${${ICU_PUBLIC_VAR_NS}_MAJOR_VERSION}.${${ICU_PUBLIC_VAR_NS}_MINOR_VERSION}.${${ICU_PUBLIC_VAR_NS}_PATCH_VERSION}")
+    ########## </part to keep synced with tests/version/CMakeLists.txt> ##########
+
+    # Check dependencies (implies pkg-config)
+    if(PKG_CONFIG_FOUND)
+        set(${ICU_PRIVATE_VAR_NS}_COMPONENTS_DUP ${${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS})
+        foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PRIVATE_VAR_NS}_COMPONENTS_DUP})
+            pkg_check_modules(PC_ICU_PRIVATE_VAR_NS "icu-${${ICU_PRIVATE_VAR_NS}_COMPONENT}" QUIET)
+
+            if(${PC_ICU_PRIVATE_VAR_NS}_FOUND)
+                foreach(${PC_ICU_PRIVATE_VAR_NS}_LIBRARY ${PC_ICU_LIBRARIES})
+                    string(REGEX REPLACE "^icu" "" ${PC_ICU_PRIVATE_VAR_NS}_STRIPPED_LIBRARY ${${PC_ICU_PRIVATE_VAR_NS}_LIBRARY})
+                    list(APPEND ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS ${${PC_ICU_PRIVATE_VAR_NS}_STRIPPED_LIBRARY})
+                endforeach(${PC_ICU_PRIVATE_VAR_NS}_LIBRARY)
+            endif(${PC_ICU_PRIVATE_VAR_NS}_FOUND)
+        endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+        list(REMOVE_DUPLICATES ${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS)
+    endif(PKG_CONFIG_FOUND)
+
+    # Check libraries
+    foreach(${ICU_PRIVATE_VAR_NS}_COMPONENT ${${ICU_PUBLIC_VAR_NS}_FIND_COMPONENTS})
+        set(${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES )
+        set(${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES )
+        foreach(${ICU_PRIVATE_VAR_NS}_BASE_NAME ${${ICU_PRIVATE_VAR_NS}_COMPONENTS_${${ICU_PRIVATE_VAR_NS}_COMPONENT}})
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}")
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}d")
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}${ICU_MAJOR_VERSION}${ICU_MINOR_VERSION}")
+            list(APPEND ${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES "${${ICU_PRIVATE_VAR_NS}_BASE_NAME}${ICU_MAJOR_VERSION}${ICU_MINOR_VERSION}d")
+        endforeach(${ICU_PRIVATE_VAR_NS}_BASE_NAME)
+
+        find_library(
+            ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}
+            NAMES ${${ICU_PRIVATE_VAR_NS}_POSSIBLE_RELEASE_NAMES}
+            HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT}
+            PATH_SUFFIXES ${_ICU_LIB_SUFFIXES}
+            DOC "Release libraries for ICU"
+        )
+        find_library(
+            ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}
+            NAMES ${${ICU_PRIVATE_VAR_NS}_POSSIBLE_DEBUG_NAMES}
+            HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT}
+            PATH_SUFFIXES ${_ICU_LIB_SUFFIXES}
+            DOC "Debug libraries for ICU"
+        )
+
+        string(TOUPPER "${${ICU_PRIVATE_VAR_NS}_COMPONENT}" ${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT)
+        if(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT} AND NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # both not found
+            set("${ICU_PUBLIC_VAR_NS}_${${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT}_FOUND" FALSE)
+            set("${ICU_PUBLIC_VAR_NS}_FOUND" FALSE)
+        else(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT} AND NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # one or both found
+            set("${ICU_PUBLIC_VAR_NS}_${${ICU_PRIVATE_VAR_NS}_UPPER_COMPONENT}_FOUND" TRUE)
+            if(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # release not found => we are in debug
+                set(${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT} "${${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}")
+            elseif(NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}) # debug not found => we are in release
+                set(${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT} "${${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}")
+            else() # both found
+                set(
+                    ${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT}
+                    optimized ${${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}
+                    debug ${${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT}}
+                )
+            endif()
+            list(APPEND ${ICU_PUBLIC_VAR_NS}_LIBRARIES ${${ICU_PRIVATE_VAR_NS}_LIB_${${ICU_PRIVATE_VAR_NS}_COMPONENT}})
+        endif(NOT ${ICU_PRIVATE_VAR_NS}_LIB_RELEASE_${${ICU_PRIVATE_VAR_NS}_COMPONENT} AND NOT ${ICU_PRIVATE_VAR_NS}_LIB_DEBUG_${${ICU_PRIVATE_VAR_NS}_COMPONENT})
+    endforeach(${ICU_PRIVATE_VAR_NS}_COMPONENT)
+
+    # Try to find out compiler flags
+    find_program(${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE icu-config HINTS ${${ICU_PRIVATE_VAR_NS}_ROOT})
+    if(${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cflags OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_C_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cxxflags OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CXX_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cppflags OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CPP_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cflags-dynamic OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_C_SHARED_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cxxflags-dynamic OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CXX_SHARED_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process(COMMAND ${${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE} --cppflags-dynamic OUTPUT_VARIABLE ${ICU_PUBLIC_VAR_NS}_CPP_SHARED_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+    endif(${ICU_PUBLIC_VAR_NS}_CONFIG_EXECUTABLE)
+
+    # Check find_package arguments
+    include(FindPackageHandleStandardArgs)
+    if(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+        find_package_handle_standard_args(
+            ${ICU_PUBLIC_VAR_NS}
+            REQUIRED_VARS ${ICU_PUBLIC_VAR_NS}_LIBRARIES ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS
+            VERSION_VAR ${ICU_PUBLIC_VAR_NS}_VERSION
+        )
+    else(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+        find_package_handle_standard_args(${ICU_PUBLIC_VAR_NS} "ICU not found" ${ICU_PUBLIC_VAR_NS}_LIBRARIES ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+    endif(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+else(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+    if(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+        message(FATAL_ERROR "Could not find ICU include directory")
+    endif(${ICU_PUBLIC_VAR_NS}_FIND_REQUIRED AND NOT ${ICU_PUBLIC_VAR_NS}_FIND_QUIETLY)
+endif(${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS)
+
+mark_as_advanced(
+    ${ICU_PUBLIC_VAR_NS}_INCLUDE_DIRS
+    ${ICU_PUBLIC_VAR_NS}_LIBRARIES
+)
+
+# IN (args)
+icudebug("FIND_COMPONENTS")
+icudebug("FIND_REQUIRED")
+icudebug("FIND_QUIETLY")
+icudebug("FIND_VERSION")
+# OUT
+# Found
+icudebug("FOUND")
+icudebug("UC_FOUND")
+icudebug("I18N_FOUND")
+icudebug("IO_FOUND")
+icudebug("LE_FOUND")
+icudebug("LX_FOUND")
+icudebug("DATA_FOUND")
+# Flags
+icudebug("C_FLAGS")
+icudebug("CPP_FLAGS")
+icudebug("CXX_FLAGS")
+icudebug("C_SHARED_FLAGS")
+icudebug("CPP_SHARED_FLAGS")
+icudebug("CXX_SHARED_FLAGS")
+# Linking
+icudebug("INCLUDE_DIRS")
+icudebug("LIBRARIES")
+# Version
+icudebug("MAJOR_VERSION")
+icudebug("MINOR_VERSION")
+icudebug("PATCH_VERSION")
+icudebug("VERSION")
diff --git a/CMakeModules/FindIconv.cmake b/CMakeModules/FindIconv.cmake
new file mode 100644
index 0000000..24cdae3
--- /dev/null
+++ b/CMakeModules/FindIconv.cmake
@@ -0,0 +1,57 @@
+# - Try to find Iconv 
+# Once done this will define 
+# 
+#  ICONV_FOUND - system has Iconv 
+#  ICONV_INCLUDE_DIR - the Iconv include directory 
+#  ICONV_LIBRARIES - Link these to use Iconv 
+#  ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
+# 
+include(CheckCXXSourceCompiles)
+
+IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+  # Already in cache, be silent
+  SET(ICONV_FIND_QUIETLY TRUE)
+ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+
+FIND_PATH(ICONV_INCLUDE_DIR iconv.h) 
+ 
+FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
+ 
+IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+   SET(ICONV_FOUND TRUE) 
+ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) 
+
+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
+IF(ICONV_FOUND)
+  check_cxx_source_compiles("
+  #include <iconv.h>
+  int main(){
+    iconv_t conv = 0;
+    const char* in = 0;
+    size_t ilen = 0;
+    char* out = 0;
+    size_t olen = 0;
+    iconv(conv, &in, &ilen, &out, &olen);
+    return 0;
+  }
+" ICONV_SECOND_ARGUMENT_IS_CONST )
+ENDIF(ICONV_FOUND)
+set(CMAKE_REQUIRED_INCLUDES)
+set(CMAKE_REQUIRED_LIBRARIES)
+
+IF(ICONV_FOUND) 
+  IF(NOT ICONV_FIND_QUIETLY) 
+    MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") 
+  ENDIF(NOT ICONV_FIND_QUIETLY) 
+ELSE(ICONV_FOUND) 
+  IF(Iconv_FIND_REQUIRED) 
+    MESSAGE(FATAL_ERROR "Could not find Iconv") 
+  ENDIF(Iconv_FIND_REQUIRED) 
+ENDIF(ICONV_FOUND)
+
+MARK_AS_ADVANCED(
+  ICONV_INCLUDE_DIR
+  ICONV_LIBRARIES
+  ICONV_SECOND_ARGUMENT_IS_CONST
+)
diff --git a/CMakeModules/FindMPV.cmake b/CMakeModules/FindMPV.cmake
new file mode 100644
index 0000000..bea1003
--- /dev/null
+++ b/CMakeModules/FindMPV.cmake
@@ -0,0 +1,80 @@
+###############################################################################
+# CMake module to search for the mpv libraries.
+#
+# WARNING: This module is experimental work in progress.
+#
+# Based one FindVLC.cmake by:
+# Copyright (c) 2011 Michael Jansen <info@michael-jansen.biz>
+# Modified by Tobias Hieta <tobias@hieta.se>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+###############################################################################
+
+#
+### Global Configuration Section
+#
+SET(_MPV_REQUIRED_VARS MPV_INCLUDE_DIR MPV_LIBRARY)
+
+#
+### MPV uses pkgconfig.
+#
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_MPV QUIET mpv)
+endif(PKG_CONFIG_FOUND)
+
+if(PC_MPV_FOUND)
+  #
+  ### Look for the include files.
+  #
+  find_path(
+      MPV_INCLUDE_DIR
+      NAMES mpv/client.h
+      HINTS
+          ${PC_MPV_INCLUDEDIR}
+          ${PC_MPV_INCLUDE_DIRS} # Unused for MPV but anyway
+      DOC "MPV include directory"
+      )
+
+  #
+  ### Look for the libraries
+  #
+  set(_MPV_LIBRARY_NAMES mpv)
+  if(PC_MPV_LIBRARIES)
+    set(_MPV_LIBRARY_NAMES ${PC_MPV_LIBRARIES})
+  endif(PC_MPV_LIBRARIES)
+
+  foreach(l ${_MPV_LIBRARY_NAMES})
+    find_library(
+        MPV_LIBRARY_${l}
+        NAMES ${l}
+        HINTS
+            ${PC_MPV_LIBDIR}
+            ${PC_MPV_LIBRARY_DIRS} # Unused for MPV but anyway
+        PATH_SUFFIXES lib${LIB_SUFFIX}
+    )
+    list(APPEND MPV_LIBRARY ${MPV_LIBRARY_${l}})
+  endforeach()
+  get_filename_component(_MPV_LIBRARY_DIR ${MPV_LIBRARY_mpv} PATH)
+  mark_as_advanced(MPV_LIBRARY)
+
+  set(MPV_LIBRARY_DIRS _MPV_LIBRARY_DIR)
+  list(REMOVE_DUPLICATES MPV_LIBRARY_DIRS)
+
+endif()
+
+mark_as_advanced(MPV_INCLUDE_DIR)
+mark_as_advanced(MPV_LIBRARY_DIRS)
+set(MPV_INCLUDE_DIRS ${MPV_INCLUDE_DIR})
+
+#
+### Check if everything was found and if the version is sufficient.
+#
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    MPV
+    REQUIRED_VARS ${_MPV_REQUIRED_VARS}
+    VERSION_VAR MPV_VERSION_STRING
+    )
+
diff --git a/CMakeModules/FindSDL2.cmake b/CMakeModules/FindSDL2.cmake
new file mode 100644
index 0000000..9c8a3bd
--- /dev/null
+++ b/CMakeModules/FindSDL2.cmake
@@ -0,0 +1,69 @@
+###############################################################################
+# CMake module to search for the SDL libraries.
+#
+# WARNING: This module is experimental work in progress.
+#
+# Based one FindVLC.cmake by:
+# Copyright (c) 2011 Michael Jansen <info@michael-jansen.biz>
+# Modified by Tobias Hieta <tobias@hieta.se>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+###############################################################################
+
+#
+### Global Configuration Section
+#
+SET(_SDL2_REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARY)
+
+#
+### SDL uses pkgconfig.
+#
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_SDL QUIET sdl2)
+endif(PKG_CONFIG_FOUND)
+
+#
+### Look for the include files.
+#
+find_path(
+    SDL2_INCLUDE_DIR
+    NAMES SDL.h
+    PATH_SUFFIXES SDL2
+    HINTS
+        ${PC_SDL2_INCLUDEDIR}
+        ${PC_SDL2_INCLUDE_DIRS} # Unused for SDL but anyway
+    DOC "SDL2 include directory"
+    )
+mark_as_advanced(SDL2_INCLUDE_DIR)
+set(SDL2_INCLUDE_DIRS ${SDL_INCLUDE_DIR})
+
+#
+### Look for the libraries (SDL and SDLsore)
+#
+find_library(
+    SDL2_LIBRARY
+    NAMES SDL2
+    HINTS
+        ${PC_SDL2_LIBDIR}
+        ${PC_SDL2_LIBRARY_DIRS} # Unused for SDL but anyway
+    PATH_SUFFIXES lib${LIB_SUFFIX}
+    )
+get_filename_component(_SDL2_LIBRARY_DIR "${SDL2_LIBRARY}" PATH)
+mark_as_advanced(SDL2_LIBRARY)
+
+set(SDL2_LIBRARY_DIRS _SDL2_LIBRARY_DIR)
+list(REMOVE_DUPLICATES SDL2_LIBRARY_DIRS)
+mark_as_advanced(SDL2_LIBRARY_DIRS)
+
+#
+### Check if everything was found and if the version is sufficient.
+#
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+    SDL2
+    REQUIRED_VARS ${_SDL2_REQUIRED_VARS}
+    VERSION_VAR SDL2_VERSION_STRING
+    )
+
diff --git a/CMakeModules/GCCConfiguration.cmake b/CMakeModules/GCCConfiguration.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/CMakeModules/GetDate.cmake b/CMakeModules/GetDate.cmake
new file mode 100644
index 0000000..b2f8ade
--- /dev/null
+++ b/CMakeModules/GetDate.cmake
@@ -0,0 +1,13 @@
+MACRO (TODAY RESULT) 
+    IF (WIN32) 
+        #EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
+        #string(REGEX REPLACE "(..)/(..)/(....).*" "\\3\\2\\1" ${RESULT} ${${RESULT}})
+        set(${RESULT})
+    ELSEIF(UNIX) 
+        EXECUTE_PROCESS(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE ${RESULT}) 
+        string(REGEX REPLACE "(..)/(..)/(....).*" "\\3\\2\\1" ${RESULT} ${${RESULT}}) 
+    ELSE (WIN32) 
+        MESSAGE(SEND_ERROR "date not implemented") 
+        SET(${RESULT} 000000) 
+    ENDIF (WIN32) 
+ENDMACRO (TODAY) 
diff --git a/CMakeModules/GetGitRevisionDescription.cmake b/CMakeModules/GetGitRevisionDescription.cmake
new file mode 100644
index 0000000..1bf0230
--- /dev/null
+++ b/CMakeModules/GetGitRevisionDescription.cmake
@@ -0,0 +1,123 @@
+# - Returns a version string from Git
+#
+# These functions force a re-configure on each git commit so that you can
+# trust the values of the variables in your build system.
+#
+#  get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
+#
+# Returns the refspec and sha hash of the current head revision
+#
+#  git_describe(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe on the source tree, and adjusting
+# the output so that it tests false if an error occurs.
+#
+#  git_get_exact_tag(<var> [<additional arguments to git describe> ...])
+#
+# Returns the results of git describe --exact-match on the source tree,
+# and adjusting the output so that it tests false if there was no exact
+# matching tag.
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(__get_git_revision_description)
+	return()
+endif()
+set(__get_git_revision_description YES)
+
+# We must run the following at "include" time, not at function call time,
+# to find the path to this module rather than the path to a calling list file
+get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
+
+function(get_git_head_revision _refspecvar _hashvar)
+	set(GIT_PARENT_DIR "${CMAKE_SOURCE_DIR}")
+	set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	while(NOT EXISTS "${GIT_DIR}")	# .git dir not found, search parent directories
+		set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
+		get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
+		if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
+			# We have reached the root directory, we are not in git
+			set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
+			return()
+		endif()
+		set(GIT_DIR "${GIT_PARENT_DIR}/.git")
+	endwhile()
+	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
+	if(NOT EXISTS "${GIT_DATA}")
+		file(MAKE_DIRECTORY "${GIT_DATA}")
+	endif()
+
+	if(NOT EXISTS "${GIT_DIR}/HEAD")
+		return()
+	endif()
+	set(HEAD_FILE "${GIT_DATA}/HEAD")
+	configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
+
+	configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
+		"${GIT_DATA}/grabRef.cmake"
+		@ONLY)
+	include("${GIT_DATA}/grabRef.cmake")
+
+	set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
+	set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
+endfunction()
+
+function(git_describe _var)
+	if(NOT GIT_FOUND)
+		find_package(Git QUIET)
+	endif()
+	get_git_head_revision(refspec hash)
+	if(NOT GIT_FOUND)
+		set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+	if(NOT hash)
+		set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
+		return()
+	endif()
+
+	# TODO sanitize
+	#if((${ARGN}" MATCHES "&&") OR
+	#	(ARGN MATCHES "||") OR
+	#	(ARGN MATCHES "\\;"))
+	#	message("Please report the following error to the project!")
+	#	message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
+	#endif()
+
+	#message(STATUS "Arguments to execute_process: ${ARGN}")
+
+	execute_process(COMMAND
+		"${GIT_EXECUTABLE}"
+		describe
+		${hash}
+		${ARGN}
+		WORKING_DIRECTORY
+		"${CMAKE_SOURCE_DIR}"
+		RESULT_VARIABLE
+		res
+		OUTPUT_VARIABLE
+		out
+		ERROR_QUIET
+		OUTPUT_STRIP_TRAILING_WHITESPACE)
+	if(NOT res EQUAL 0)
+		set(out "${out}-${res}-NOTFOUND")
+	endif()
+
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
+
+function(git_get_exact_tag _var)
+	git_describe(out --exact-match ${ARGN})
+	set(${_var} "${out}" PARENT_SCOPE)
+endfunction()
diff --git a/CMakeModules/GetGitRevisionDescription.cmake.in b/CMakeModules/GetGitRevisionDescription.cmake.in
new file mode 100644
index 0000000..888ce13
--- /dev/null
+++ b/CMakeModules/GetGitRevisionDescription.cmake.in
@@ -0,0 +1,38 @@
+# 
+# Internal file for GetGitRevisionDescription.cmake
+#
+# Requires CMake 2.6 or newer (uses the 'function' command)
+#
+# Original Author:
+# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2009-2010.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+set(HEAD_HASH)
+
+file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
+
+string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
+if(HEAD_CONTENTS MATCHES "ref")
+	# named branch
+	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
+	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
+		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+	elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}")
+		configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
+		set(HEAD_HASH "${HEAD_REF}")
+	endif()
+else()
+	# detached HEAD
+	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
+endif()
+
+if(NOT HEAD_HASH)
+	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
+	string(STRIP "${HEAD_HASH}" HEAD_HASH)
+endif()
diff --git a/CMakeModules/InputConfiguration.cmake b/CMakeModules/InputConfiguration.cmake
new file mode 100644
index 0000000..59cc7db
--- /dev/null
+++ b/CMakeModules/InputConfiguration.cmake
@@ -0,0 +1,71 @@
+OPTION(ENABLE_SDL2 "Enable SDL2 for joystick handling" ON)
+if(ENABLE_SDL2)
+  find_package(SDL2)
+  if(SDL2_FOUND)
+    list(APPEND ENABLED_INPUTS SDL2)
+
+    if(NOT WIN32)
+      find_package(Iconv)
+
+      if(NOT ICONV_FOUND)
+        unset(SDL2_FOUND)
+      endif(NOT ICONV_FOUND)
+
+      find_package(DL)
+
+      if(NOT DL_FOUND)
+        unset(SDL2_FOUND)
+      endif(NOT DL_FOUND)
+
+      list(APPEND SDL2_LIBRARY ${ICONV_LIBRARIES} ${DL_LIBRARIES})
+    endif()
+
+    if(APPLE)
+      find_package(Iconv)
+
+      if(NOT ICONV_FOUND)
+        unset(SDL2_FOUND)
+      endif(NOT ICONV_FOUND)
+
+      list(APPEND SDL2_LIBRARY ${ICONV_LIBRARIES})
+      find_library(FORCEFEEDBACK ForceFeedback)
+      find_library(CARBON Carbon)
+      list(APPEND SDL2_LIBRARY ${FORCEFEEDBACK} ${CARBON})
+    endif(APPLE)
+
+    if(SDL2_FOUND)
+      add_definitions(-DHAVE_SDL)
+      include_directories(${SDL2_INCLUDE_DIR})
+      set(EXTRA_LIBS ${SDL2_LIBRARY})
+    endif(SDL2_FOUND)
+
+  endif(SDL2_FOUND)
+
+endif(ENABLE_SDL2)
+
+OPTION(ENABLE_CEC "Enable HDMI/CEC support with libCEC" ON)
+if(ENABLE_CEC)
+  find_package(CEC)
+  if(CEC_FOUND)
+    list(APPEND ENABLED_INPUTS CEC)
+    add_definitions(-DHAVE_CEC)
+    include_directories(${CEC_INCLUDE_DIR})
+    set(EXTRA_LIBS ${EXTRA_LIBS} ${CEC_LIBRARY})
+  endif(CEC_FOUND)
+
+endif(ENABLE_CEC)
+
+if(UNIX AND NOT APPLE)
+  OPTION(ENABLE_LIRC "Enable LIRC for Linux IR handling" ON)
+  if(ENABLE_LIRC)
+    list(APPEND ENABLED_INPUTS LIRC)
+    add_definitions(-DHAVE_LIRC)
+  endif(ENABLE_LIRC)
+endif(UNIX AND NOT APPLE)
+
+if(APPLE)
+  list(APPEND ENABLED_INPUTS "AppleRemote")
+endif(APPLE)
+
+string(REPLACE ";" " " _STR "${ENABLED_INPUTS}")
+message(STATUS "Enabled Inputs: " ${_STR})
diff --git a/CMakeModules/LinuxConfiguration.cmake b/CMakeModules/LinuxConfiguration.cmake
new file mode 100644
index 0000000..93bbb19
--- /dev/null
+++ b/CMakeModules/LinuxConfiguration.cmake
@@ -0,0 +1,14 @@
+find_package(X11)
+if(X11_FOUND AND X11_Xrandr_FOUND)
+  include_directories(X11_X11_INCLUDE_PATH X11_Xrandr_INCLUDE_PATH)
+  set(X11XRANDR_FOUND 1)
+  add_definitions(-DUSE_X11XRANDR)
+endif()
+
+if (NOT BUILD_TARGET STREQUAL "RPI")
+  set(USE_X11POWER ON)
+  add_definitions(-DUSE_X11POWER)
+endif()
+
+set(INSTALL_BIN_DIR bin)
+set(INSTALL_RESOURCE_DIR share)
diff --git a/CMakeModules/NameConfiguration.cmake b/CMakeModules/NameConfiguration.cmake
new file mode 100644
index 0000000..dda3da1
--- /dev/null
+++ b/CMakeModules/NameConfiguration.cmake
@@ -0,0 +1,16 @@
+set(HELPER_TARGET PMPHelper)
+set(MAIN_TARGET PlexMediaPlayer)
+
+# Name of the output binary, defaults are only used on Linux
+set(HELPER_NAME pmphelper)
+set(MAIN_NAME plexmediaplayer)
+
+if(APPLE)
+  set(HELPER_NAME "PMP Helper")
+  set(MAIN_NAME "Plex Media Player")
+elseif(WIN32)
+  set(HELPER_NAME "PMPHelper")
+  set(MAIN_NAME "PlexMediaPlayer")
+endif(APPLE)
+
+configure_file(src/shared/Names.cpp.in src/shared/Names.cpp @ONLY)
\ No newline at end of file
diff --git a/CMakeModules/PlayerConfiguration.cmake b/CMakeModules/PlayerConfiguration.cmake
new file mode 100644
index 0000000..b01e6e5
--- /dev/null
+++ b/CMakeModules/PlayerConfiguration.cmake
@@ -0,0 +1,16 @@
+# We want OpenGL or OpenGLES2
+find_package(OpenGL)
+if(NOT OPENGL_FOUND)
+  find_package(GLES2)
+  if(NOT GLES2_FOUND)
+    message(FATAL_ERROR "OpenGL or GLES2 is required")
+  else(NOT GLES2_FOUND)
+    set(OPENGL_LIBS ${GLES2_LIBRARY})
+  endif(NOT GLES2_FOUND)
+else(NOT OPENGL_FOUND)
+  set(OPENGL_LIBS ${OPENGL_gl_LIBRARY})
+endif(NOT OPENGL_FOUND)
+
+find_package(MPV REQUIRED)
+
+include_directories(${MPV_INCLUDE_DIR})
diff --git a/CMakeModules/QtConfiguration.cmake b/CMakeModules/QtConfiguration.cmake
new file mode 100644
index 0000000..fb752dc
--- /dev/null
+++ b/CMakeModules/QtConfiguration.cmake
@@ -0,0 +1,57 @@
+set(QTROOT "/usr/local/Qt/Qt5.5" CACHE PATH "Root of the QT binaries.")
+set(REQUIRED_QT_VERSION "5.5.0")
+
+set(QTCONFIGROOT ${QTROOT}/lib/cmake/Qt5)
+set(components Core Network WebChannel Qml Quick Xml WebEngine)
+
+if(OPENELEC)
+  set(components ${components} DBus)
+endif(OPENELEC)
+
+foreach(COMP ${components})
+	set(mod Qt5${COMP})
+	
+	# look for the config files in the QtConfigRoot defined above
+	set(${mod}_DIR ${QTCONFIGROOT}${COMP})
+
+	# look for the actual package
+	find_package(${mod} ${REQUIRED_QT_VERSION} REQUIRED)
+
+	include_directories(${${mod}_INCLUDE_DIRS})
+	if(OPENELEC)
+		include_directories(${${mod}_PRIVATE_INCLUDE_DIRS})
+	endif(OPENELEC)
+
+	list(APPEND QT5_LIBRARIES ${${mod}_LIBRARIES})
+	list(APPEND QT5_CFLAGS ${${mod}_EXECUTABLE_COMPILE_FLAGS})
+endforeach(COMP ${components})
+
+list(REMOVE_DUPLICATES QT5_CFLAGS)
+
+message(STATUS "Qt version: ${Qt5Core_VERSION_STRING}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${QT5_CFLAGS}")
+
+set(CMAKE_REQUIRED_INCLUDES ${Qt5WebEngine_INCLUDE_DIRS};${Qt5WebEngine_PRIVATE_INCLUDE_DIRS})
+set(CMAKE_REQUIRED_LIBRARIES ${QT5_LIBRARIES})
+
+OPTION(SKIP_QT_TEST "Skip tests for required Qt features" OFF)
+
+if(NOT SKIP_QT_TEST)
+	include(CheckCXXSourceCompiles)
+        check_cxx_source_compiles("
+                #include <private/qquickwebengineview_p.h>
+                #include <QColor>
+                int main()
+                {
+                QQuickWebEngineView* view = new QQuickWebEngineView(NULL);
+                view->setBackgroundColor(QColor(\"transparent\"));
+                }
+	" WebEngineBackgroundProperty)
+
+	if(NOT WebEngineBackgroundProperty)
+		message(FATAL_ERROR "QQuickWebEngineView doesn't have the background property."
+			"This will break video playback. As of Qt 5.5 you need to manually patch and build Qt to get this property."
+			"With the release of Qt5.6 it will no longer be required. See qt-patches/README for more details.")
+	endif(NOT WebEngineBackgroundProperty)
+
+endif(NOT SKIP_QT_TEST)
diff --git a/CMakeModules/VersionConfiguration.cmake b/CMakeModules/VersionConfiguration.cmake
new file mode 100644
index 0000000..6a9a2df
--- /dev/null
+++ b/CMakeModules/VersionConfiguration.cmake
@@ -0,0 +1,30 @@
+# Get the current date.
+include(GetDate)
+include(WebClientVariables)
+today(CURRENT_DATE)
+
+# Get git revision version
+include(GetGitRevisionDescription)
+get_git_head_revision(REFSPEC FULL_GIT_REVISION)
+if(FULL_GIT_REVISION STREQUAL "GITDIR-NOTFOUND")
+  set(GIT_REVISION "git")
+else(FULL_GIT_REVISION STREQUAL "GITDIR-NOTFOUND")
+  string(SUBSTRING ${FULL_GIT_REVISION} 0 8 GIT_REVISION)
+endif(FULL_GIT_REVISION STREQUAL "GITDIR-NOTFOUND")
+
+# Get the build number if available
+if(DEFINED ENV{BUILD_NUMBER})
+  set(VERSION_BUILD "$ENV{BUILD_NUMBER}")
+  set(VERSION_BUILD_NR "$ENV{BUILD_NUMBER}")
+else()
+  set(VERSION_BUILD "dev")
+  set(VERSION_BUILD_NR "0")
+endif()
+
+set(VERSION_MAJOR 1)
+set(VERSION_MINOR 0)
+set(VERSION_NANO 0)
+
+set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}.${VERSION_BUILD}-${GIT_REVISION}")
+set(CANONICAL_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_NANO}-${GIT_REVISION}")
+configure_file(src/Version.cpp.in src/Version.cpp)
\ No newline at end of file
diff --git a/CMakeModules/WebClientResources.cmake b/CMakeModules/WebClientResources.cmake
new file mode 100644
index 0000000..2a927fe
--- /dev/null
+++ b/CMakeModules/WebClientResources.cmake
@@ -0,0 +1,36 @@
+include(WebClientVariables)
+
+option(SKIP_WEB_CLIENT "Skip downloading the web client" OFF)
+
+if(NOT SKIP_WEB_CLIENT)
+  set(WEB_CLIENT_CPP web-client-${WEB_CLIENT_VERSION}.cpp)
+  set(WEB_CLIENT_URL https://nightlies.plex.tv/directdl/plex-web-client-plexmediaplayer/master/plex-web-client-konvergo-${WEB_CLIENT_VERSION}.cpp.bz2)
+
+  message(STATUS "web-client version: ${WEB_CLIENT_VERSION}")
+
+  file(
+    DOWNLOAD ${WEB_CLIENT_URL} ${CMAKE_CURRENT_BINARY_DIR}/${WEB_CLIENT_CPP}.bz2
+    EXPECTED_HASH SHA1=${WEB_CLIENT_HASH}
+    TIMEOUT 100
+    SHOW_PROGRESS
+    TLS_VERIFY ON
+  )
+
+  find_program(BUNZIP2 bunzip2${CMAKE_EXECUTABLE_SUFFIX})
+  if(${BUNZIP2} MATCHES NOT_FOUND)
+    message(FATAL_ERROR "Can't fid bunzip2")
+  endif(${BUNZIP2} MATCHES NOT_FOUND)
+
+  add_custom_command(
+    OUTPUT ${WEB_CLIENT_CPP}
+    COMMAND ${BUNZIP2} -k -f ${CMAKE_CURRENT_BINARY_DIR}/${WEB_CLIENT_CPP}.bz2
+    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${WEB_CLIENT_CPP}.bz2
+    COMMENT "Unpacking: ${WEB_CLIENT_CPP}.bz2"
+  )
+
+  add_custom_target(UnpackWebClientResource
+    DEPENDS ${WEB_CLIENT_CPP}
+  )
+else(NOT SKIP_WEB_CLIENT)
+  message(WARNING "Skipping web-client, you will not a functioning end product")
+endif(NOT SKIP_WEB_CLIENT)
diff --git a/CMakeModules/WebClientVariables.cmake b/CMakeModules/WebClientVariables.cmake
new file mode 100644
index 0000000..d9fd3ac
--- /dev/null
+++ b/CMakeModules/WebClientVariables.cmake
@@ -0,0 +1,2 @@
+set(WEB_CLIENT_VERSION a1def70)
+set(WEB_CLIENT_HASH 16d2ef0a5b46fb6746aed6d3f3f7234d463f2c36)
diff --git a/CMakeModules/Win32Configuration.cmake b/CMakeModules/Win32Configuration.cmake
new file mode 100644
index 0000000..d91b113
--- /dev/null
+++ b/CMakeModules/Win32Configuration.cmake
@@ -0,0 +1,14 @@
+set(INSTALL_BIN_DIR .)
+set(INSTALL_RESOURCE_DIR resources)
+set(HAVE_UPDATER 1)
+
+
+# Add install rules for required system runtimes such as MSVCRxx.dll
+SET (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP ON)
+INCLUDE(InstallRequiredSystemLibraries)
+IF (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
+  INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}
+    DESTINATION ${INSTALL_BIN_DIR}
+    PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ
+    COMPONENT Runtime)
+ENDIF (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
diff --git a/CMakeModules/utils.cmake b/CMakeModules/utils.cmake
new file mode 100644
index 0000000..21c92e8
--- /dev/null
+++ b/CMakeModules/utils.cmake
@@ -0,0 +1,70 @@
+#############################################################
+function(set_bundle_dir)
+  set(args SOURCES DEST EXCLUDE)
+  include(CMakeParseArguments)
+  cmake_parse_arguments(BD "" "" "${args}" ${ARGN})
+
+  foreach(_BDIR ${BD_SOURCES}) 
+    file(GLOB _DIRCONTENTS ${_BDIR}/*)
+    foreach(_BDFILE ${_DIRCONTENTS})
+      get_filename_component(_BDFILE_NAME ${_BDFILE} NAME)
+
+      set(PROCESS_FILE 1)
+      foreach(EX_FILE ${BD_EXCLUDE})
+        string(REGEX MATCH ${EX_FILE} DID_MATCH ${_BDFILE})
+        if(NOT "${DID_MATCH}" STREQUAL "")
+          set(PROCESS_FILE 0)
+        endif(NOT "${DID_MATCH}" STREQUAL "")
+      endforeach(EX_FILE ${BD_EXCLUDE})
+      
+      if(PROCESS_FILE STREQUAL "1")
+        if(IS_DIRECTORY ${_BDFILE})
+          set_bundle_dir(SOURCES ${_BDFILE} DEST ${BD_DEST}/${_BDFILE_NAME} EXCLUDE ${BD_EXCLUDE})
+        else(IS_DIRECTORY ${_BDFILE})
+          #message("set_bundle_dir : setting package_location ${_BDFILE} = ${BD_DEST}")
+          set_source_files_properties(${_BDFILE} PROPERTIES MACOSX_PACKAGE_LOCATION ${BD_DEST})
+          get_property(BUNDLED_FILES GLOBAL PROPERTY CONFIG_BUNDLED_FILES)
+          set_property(GLOBAL PROPERTY CONFIG_BUNDLED_FILES ${BUNDLED_FILES} ${_BDFILE})
+
+          string(REPLACE "/" "\\\\" GNAME ${BD_DEST})
+          source_group(${GNAME} FILES ${_BDFILE})
+        endif(IS_DIRECTORY ${_BDFILE})
+      endif()
+    endforeach(_BDFILE ${_DIRCONTENTS})
+  endforeach(_BDIR ${BD_SOURCES})
+endfunction(set_bundle_dir)
+
+#############################################################
+macro(find_all_sources DIRECTORY VARIABLE)
+  aux_source_directory(${DIRECTORY} ${VARIABLE})
+  file(GLOB headers ${DIRECTORY}/*h)
+  list(APPEND ${VARIABLE} ${headers})
+endmacro()
+
+#############################################################
+# function to collect all the sources from sub-directories
+# into a single list
+function(add_sources)
+  get_property(is_defined GLOBAL PROPERTY SRCS_LIST DEFINED)
+  if(NOT is_defined)
+    define_property(GLOBAL PROPERTY SRCS_LIST
+      BRIEF_DOCS "List of source files"
+      FULL_DOCS "List of source files to be compiled in one library")
+  endif()
+  # make absolute paths
+  set(SRCS)
+  foreach(s IN LISTS ARGN)
+    if(NOT IS_ABSOLUTE "${s}")
+      get_filename_component(s "${s}" ABSOLUTE)
+    endif()
+    list(APPEND SRCS "${s}")
+  endforeach()
+
+  string(REPLACE ${CMAKE_SOURCE_DIR}/src/ "" SUBDIR ${CMAKE_CURRENT_SOURCE_DIR})
+  string(TOLOWER ${SUBDIR} SUBDIR)
+  string(REPLACE "/" "\\\\" LIBNAME ${SUBDIR})
+  source_group(${LIBNAME} FILES ${SRCS})
+
+  # add it to the global list.
+  set_property(GLOBAL APPEND PROPERTY SRCS_LIST ${SRCS})
+endfunction(add_sources)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4df57ce
--- /dev/null
+++ b/README.md
@@ -0,0 +1,52 @@
+## Building
+
+You need:
+
+* Qt 5.6 alpha
+* cmake 3.0 or newer
+* ninja is recommended for building
+
+Special Qt requirements:
+
+* On Windows, you must apply qt-patches/0003-Always-enable-viewport-stuff.patch for
+  correct window scaling. Applying the patches in qt-patches/qt-5.6-alpha/ fixes
+  some stability issues.
+* On OSX, you should apply qt-patches/0002-qtbase-Don-t-show-the-menu-bar-at-all-in-lion-style-fullscr.patch
+  to improve the user experience in fullscreen.
+* You can try to use Qt 5.5, but then you also need to apply the following patches:
+    qt-patches/0001-qtwebengine-Add-a-backgroundColor-property.patch
+    qt-patches/0004-qtwebengine-transparency-window-creation.patch
+  Without them, video playback will not work.
+
+Get dependencies:
+
+* scripts/fetch-binaries.py -p darwin-x86_64
+
+If you're happy just building from the command line then run CMake for the ninja build tool:
+
+* mkdir build ; cd build
+* cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DQTROOT=/path/to/qt -DCMAKE_INSTALL_PREFIX=output ..
+
+Build (ninja):
+
+* ninja
+
+Make a distributable package:
+
+* ninja install (be patient, it's slow)
+
+Or if you prefer working in Xcode, run CMake for the xcode build):
+
+* mkdir build ; cd build
+* cmake -GXcode -DQTROOT=/path/to/qt ..
+
+
+### Debugging Web Client
+
+You can run a locally hosted development version of the web app within the Konvergo application. If the main app window is open you can also run Chrome side by side to debug.
+
+* Run the `grunt server:konvergo` from the `web-client` submodule. This will run a dev version of the web client
+* Update the `starturl` in `~/Library/Application Support/Plex Media Player/Plex Media Player.conf` to point to `http://localhost:3333/app/dev-konvergo.html`
+* Run the `Plex Media Player.app`
+* Tail the `~/Library/Logs/Plex Media Player/Plex Media Player.log`, optionally grepped with `WebClient` to see `console.log`s
+* Open Chrome and point to `http://localhost:3333/app/dev-konvergo.html`. This should open a Qt channel to the main `Plex Media Player.app` and function as normal - but with the ability to add breakpoints and inspect code
diff --git a/bundle/osx/Info.plist.in b/bundle/osx/Info.plist.in
new file mode 100644
index 0000000..89697f1
--- /dev/null
+++ b/bundle/osx/Info.plist.in
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
+	<key>CFBundleIconFile</key>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.9</string>
+</dict>
+</plist>
diff --git a/bundle/osx/Konvergo.entitlements b/bundle/osx/Konvergo.entitlements
new file mode 100644
index 0000000..7a2230d
--- /dev/null
+++ b/bundle/osx/Konvergo.entitlements
@@ -0,0 +1,12 @@
+<?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>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+</dict>
+</plist>
diff --git a/bundle/osx/Plex.icns b/bundle/osx/Plex.icns
new file mode 100644
index 0000000..58cc3b3
Binary files /dev/null and b/bundle/osx/Plex.icns differ
diff --git a/bundle/osx/WebEngine.entitlements b/bundle/osx/WebEngine.entitlements
new file mode 100644
index 0000000..794eada
--- /dev/null
+++ b/bundle/osx/WebEngine.entitlements
@@ -0,0 +1,10 @@
+<?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>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.inherit</key>
+	<true/>
+</dict>
+</plist>
diff --git a/bundle/osx/qt.conf b/bundle/osx/qt.conf
new file mode 100644
index 0000000..df50e9d
--- /dev/null
+++ b/bundle/osx/qt.conf
@@ -0,0 +1,4 @@
+[Paths]
+Plugins = ../PlugIns
+Imports = ../Resources/qml
+Qml2Imports = ../Resources/qml
diff --git a/bundle/win/Plex.ico b/bundle/win/Plex.ico
new file mode 100644
index 0000000..33034c7
Binary files /dev/null and b/bundle/win/Plex.ico differ
diff --git a/bundle/win/PlexMediaPlayer-angle.bat b/bundle/win/PlexMediaPlayer-angle.bat
new file mode 100644
index 0000000..5f8f7d6
--- /dev/null
+++ b/bundle/win/PlexMediaPlayer-angle.bat
@@ -0,0 +1,2 @@
+set QT_OPENGL=angle
+start PlexMediaPlayer.exe
diff --git a/bundle/win/iconres.rc b/bundle/win/iconres.rc
new file mode 100644
index 0000000..9872ee2
--- /dev/null
+++ b/bundle/win/iconres.rc
@@ -0,0 +1 @@
+IDI_ICON ICON Plex.ico
\ No newline at end of file
diff --git a/bundle/win/qt.conf b/bundle/win/qt.conf
new file mode 100644
index 0000000..799e1d8
--- /dev/null
+++ b/bundle/win/qt.conf
@@ -0,0 +1,7 @@
+[Paths]
+Prefix = .
+Plugins = .
+Binaries = .
+Imports = .
+Qml2Imports = .
+LibraryExecutables = .
diff --git a/bundle/win/shortcut.qs b/bundle/win/shortcut.qs
new file mode 100644
index 0000000..2b1d81e
--- /dev/null
+++ b/bundle/win/shortcut.qs
@@ -0,0 +1,15 @@
+function Component()
+{
+  // default constructor
+}
+
+Component.prototype.createOperations = function()
+{
+  component.createOperations();
+
+  if (systemInfo.productType === "windows") {
+    component.addOperation("CreateShortcut", "@TargetDir@/PlexMediaPlayer.exe", "@StartMenuDir@/Plex Media Player.lnk");
+    component.addOperation("CreateShortcut", "@TargetDir@/PlexMediaPlayer-angle.bat", "@StartMenuDir@/Plex Media Player (DirectX).lnk");
+    component.addOperation("CreateShortcut", "@TargetDir@/maintenancetool.exe", "@StartMenuDir@/Maintain Plex Media Player.lnk");
+  }
+}
\ No newline at end of file
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
new file mode 100644
index 0000000..15d94f5
--- /dev/null
+++ b/external/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_subdirectory(qhttpserver)
+add_subdirectory(qslog)
+
+if(APPLE)
+  add_subdirectory(plistparser)
+  add_subdirectory(SPMediaKeyTap)
+endif(APPLE)
\ No newline at end of file
diff --git a/external/SPMediaKeyTap/CMakeLists.txt b/external/SPMediaKeyTap/CMakeLists.txt
new file mode 100644
index 0000000..f076fb1
--- /dev/null
+++ b/external/SPMediaKeyTap/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+# SPMediaKeyTap uses some deprecated methods, no need to fix that right now, so let's supress the warnings.
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
+
+add_library(spmediakeytap STATIC
+  SPMediaKeyTap.h SPMediaKeyTap.m
+  SPInvocationGrabbing/NSObject+SPInvocationGrabbing.m
+  SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h
+)
\ No newline at end of file
diff --git a/external/SPMediaKeyTap/LICENSE b/external/SPMediaKeyTap/LICENSE
new file mode 100644
index 0000000..a43e412
--- /dev/null
+++ b/external/SPMediaKeyTap/LICENSE
@@ -0,0 +1,8 @@
+Copyright (c) 2011, Joachim Bengtsson
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Neither the name of the organization nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/external/SPMediaKeyTap/README.md b/external/SPMediaKeyTap/README.md
new file mode 100644
index 0000000..171a604
--- /dev/null
+++ b/external/SPMediaKeyTap/README.md
@@ -0,0 +1,12 @@
+SPMediaKeyTap
+=============
+
+`SPMediaKeyTap` abstracts a `CGEventHook` and other nastiness in order to give you a relatively simple API to receive media key events (prev/next/playpause, on F7 to F9 on modern MacBook Pros) exclusively, without them reaching other applications like iTunes. `SPMediaKeyTap` is clever enough to resign its exclusive lock on media keys by looking for which application was active most recently: if that application is in `SPMediaKeyTap`'s whitelist, it will resign the keys. This is similar to the behavior of Apple's applications collaborating on media key handling exclusivity, but unfortunately, Apple is not exposing any APIs allowing third-parties to join in on this collaboration.
+
+For now, the whitelist is just a hardcoded array in `+[SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers]`. If your app starts using `SPMediaKeyTap`, please [mail me](mailto:nevyn@spotify.com) your bundle ID, and I'll include it in the canonical repository. This is a bad solution; a better solution would be to use distributed notifications to collaborate in creating this whitelist at runtime. Hopefully someone'll have the time and energy to write this soon. 
+
+In `Example/SPMediaKeyTapExampleAppDelegate.m` is an example of both how you use `SPMediaKeyTap`, and how you handle the semi-private `NSEvent` subtypes involved in media keys, including on how to fall back to non-event tap handling of these events.
+
+`SPMediaKeyTap` and other `CGEventHook`s on the event type `NSSystemDefined` is known to interfere with each other and applications doing weird stuff with mouse input, because mouse clicks are also part of the `NSSystemDefined` category. The single issue we have had reported here at Spotify is Adobe Fireworks, in which item selection stops working with `SPMediaKeyTap` is active.
+
+`SPMediaKeyTap` requires 10.5 to work, and disables itself on 10.4.
diff --git a/external/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h b/external/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h
new file mode 100644
index 0000000..d30233d
--- /dev/null
+++ b/external/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h
@@ -0,0 +1,30 @@
+#import <Foundation/Foundation.h>
+
+@interface SPInvocationGrabber : NSObject {
+    id _object;
+    NSInvocation *_invocation;
+    int frameCount;
+    char **frameStrings;
+    BOOL backgroundAfterForward;
+    BOOL onMainAfterForward;
+    BOOL waitUntilDone;
+}
+-(id)initWithObject:(id)obj;
+-(id)initWithObject:(id)obj stacktraceSaving:(BOOL)saveStack;
+@property (readonly, retain, nonatomic) id object;
+@property (readonly, retain, nonatomic) NSInvocation *invocation;
+@property BOOL backgroundAfterForward;
+@property BOOL onMainAfterForward;
+@property BOOL waitUntilDone;
+-(void)invoke; // will release object and invocation
+-(void)printBacktrace;
+-(void)saveBacktrace;
+@end
+
+@interface NSObject (SPInvocationGrabbing)
+-(id)grab;
+-(id)invokeAfter:(NSTimeInterval)delta;
+-(id)nextRunloop;
+-(id)inBackground;
+-(id)onMainAsync:(BOOL)async;
+@end
diff --git a/external/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.m b/external/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.m
new file mode 100644
index 0000000..ce3b9f4
--- /dev/null
+++ b/external/SPMediaKeyTap/SPInvocationGrabbing/NSObject+SPInvocationGrabbing.m
@@ -0,0 +1,127 @@
+#import "NSObject+SPInvocationGrabbing.h"
+#import <execinfo.h>
+
+#pragma mark Invocation grabbing
+@interface SPInvocationGrabber ()
+@property (readwrite, retain, nonatomic) id object;
+@property (readwrite, retain, nonatomic) NSInvocation *invocation;
+
+@end
+
+@implementation SPInvocationGrabber
+- (id)initWithObject:(id)obj;
+{
+	return [self initWithObject:obj stacktraceSaving:YES];
+}
+
+-(id)initWithObject:(id)obj stacktraceSaving:(BOOL)saveStack;
+{
+	self.object = obj;
+
+	if(saveStack)
+		[self saveBacktrace];
+
+	return self;
+}
+-(void)dealloc;
+{
+	free(frameStrings);
+	self.object = nil;
+	self.invocation = nil;
+	[super dealloc];
+}
+@synthesize invocation = _invocation, object = _object;
+
+@synthesize backgroundAfterForward, onMainAfterForward, waitUntilDone;
+- (void)runInBackground;
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	@try {
+		[self invoke];
+	}
+	@finally {
+		[pool drain];
+	}
+}
+
+
+- (void)forwardInvocation:(NSInvocation *)anInvocation {
+	[anInvocation retainArguments];
+	anInvocation.target = _object;
+	self.invocation = anInvocation;
+	
+	if(backgroundAfterForward)
+		[NSThread detachNewThreadSelector:@selector(runInBackground) toTarget:self withObject:nil];
+	else if(onMainAfterForward)
+        [self performSelectorOnMainThread:@selector(invoke) withObject:nil waitUntilDone:waitUntilDone];
+}
+- (NSMethodSignature *)methodSignatureForSelector:(SEL)inSelector {
+	NSMethodSignature *signature = [super methodSignatureForSelector:inSelector];
+	if (signature == NULL)
+		signature = [_object methodSignatureForSelector:inSelector];
+    
+	return signature;
+}
+
+- (void)invoke;
+{
+
+	@try {
+		[_invocation invoke];
+	}
+	@catch (NSException * e) {
+		NSLog(@"SPInvocationGrabber's target raised %@:\n\t%@\nInvocation was originally scheduled at:", e.name, e);
+		[self printBacktrace];
+		printf("\n");
+		[e raise];
+	}
+
+	self.invocation = nil;
+	self.object = nil;
+}
+
+-(void)saveBacktrace;
+{
+  void *backtraceFrames[128];
+  frameCount = backtrace(&backtraceFrames[0], 128);
+  frameStrings = backtrace_symbols(&backtraceFrames[0], frameCount);
+}
+-(void)printBacktrace;
+{
+	for(int x = 3; x < frameCount; x++) {
+		if(frameStrings[x] == NULL) { break; }
+		printf("%s\n", frameStrings[x]);
+	}
+}
+@end
+
+@implementation NSObject (SPInvocationGrabbing)
+-(id)grab;
+{
+	return [[[SPInvocationGrabber alloc] initWithObject:self] autorelease];
+}
+-(id)invokeAfter:(NSTimeInterval)delta;
+{
+	id grabber = [self grab];
+	[NSTimer scheduledTimerWithTimeInterval:delta target:grabber selector:@selector(invoke) userInfo:nil repeats:NO];
+	return grabber;
+}
+- (id)nextRunloop;
+{
+	return [self invokeAfter:0];
+}
+-(id)inBackground;
+{
+    SPInvocationGrabber *grabber = [self grab];
+	grabber.backgroundAfterForward = YES;
+	return grabber;
+}
+-(id)onMainAsync:(BOOL)async;
+{
+    SPInvocationGrabber *grabber = [self grab];
+	grabber.onMainAfterForward = YES;
+    grabber.waitUntilDone = !async;
+	return grabber;
+}
+
+@end
diff --git a/external/SPMediaKeyTap/SPMediaKeyTap.h b/external/SPMediaKeyTap/SPMediaKeyTap.h
new file mode 100644
index 0000000..aa974d2
--- /dev/null
+++ b/external/SPMediaKeyTap/SPMediaKeyTap.h
@@ -0,0 +1,43 @@
+#include <Cocoa/Cocoa.h>
+#import <IOKit/hidsystem/ev_keymap.h>
+#import <Carbon/Carbon.h>
+
+// http://overooped.com/post/2593597587/mediakeys
+
+#define SPSystemDefinedEventMediaKeys 8
+
+@interface SPMediaKeyTap : NSObject {
+	EventHandlerRef _app_switching_ref;
+	EventHandlerRef _app_terminating_ref;
+	CFMachPortRef _eventPort;
+	CFRunLoopSourceRef _eventPortSource;
+	CFRunLoopRef _tapThreadRL;
+	BOOL _shouldInterceptMediaKeyEvents;
+	id _delegate;
+	// The app that is frontmost in this list owns media keys
+	NSMutableArray *_mediaKeyAppList;
+}
++ (NSArray*)defaultMediaKeyUserBundleIdentifiers;
+
+-(id)initWithDelegate:(id)delegate;
+
++(BOOL)usesGlobalMediaKeyTap;
+-(void)startWatchingMediaKeys;
+-(void)stopWatchingMediaKeys;
+-(void)handleAndReleaseMediaKeyEvent:(NSEvent *)event;
+@end
+
+@interface NSObject (SPMediaKeyTapDelegate)
+-(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event;
+@end
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern NSString *kMediaKeyUsingBundleIdentifiersDefaultsKey;
+extern NSString *kIgnoreMediaKeysDefaultsKey;
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/external/SPMediaKeyTap/SPMediaKeyTap.m b/external/SPMediaKeyTap/SPMediaKeyTap.m
new file mode 100644
index 0000000..54ae878
--- /dev/null
+++ b/external/SPMediaKeyTap/SPMediaKeyTap.m
@@ -0,0 +1,346 @@
+// Copyright (c) 2010 Spotify AB
+#import "SPMediaKeyTap.h"
+#import "SPInvocationGrabbing/NSObject+SPInvocationGrabbing.h" // https://gist.github.com/511181, in submodule
+
+@interface SPMediaKeyTap ()
+-(BOOL)shouldInterceptMediaKeyEvents;
+-(void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
+-(void)startWatchingAppSwitching;
+-(void)stopWatchingAppSwitching;
+-(void)eventTapThread;
+@end
+static SPMediaKeyTap *singleton = nil;
+
+static pascal OSStatus appSwitched (EventHandlerCallRef nextHandler, EventRef evt, void* userData);
+static pascal OSStatus appTerminated (EventHandlerCallRef nextHandler, EventRef evt, void* userData);
+static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon);
+
+
+// Inspired by http://gist.github.com/546311
+
+@implementation SPMediaKeyTap
+
+#pragma mark -
+#pragma mark Setup and teardown
+-(id)initWithDelegate:(id)delegate;
+{
+	_delegate = delegate;
+	[self startWatchingAppSwitching];
+	singleton = self;
+	_mediaKeyAppList = [NSMutableArray new];
+    _tapThreadRL=nil;
+    _eventPort=nil;
+    _eventPortSource=nil;
+	return self;
+}
+-(void)dealloc;
+{
+	[self stopWatchingMediaKeys];
+	[self stopWatchingAppSwitching];
+	[_mediaKeyAppList release];
+	[super dealloc];
+}
+
+-(void)startWatchingAppSwitching;
+{
+	// Listen to "app switched" event, so that we don't intercept media keys if we
+	// weren't the last "media key listening" app to be active
+	EventTypeSpec eventType = { kEventClassApplication, kEventAppFrontSwitched };
+    OSStatus err = InstallApplicationEventHandler(NewEventHandlerUPP(appSwitched), 1, &eventType, self, &_app_switching_ref);
+	assert(err == noErr);
+	
+	eventType.eventKind = kEventAppTerminated;
+    err = InstallApplicationEventHandler(NewEventHandlerUPP(appTerminated), 1, &eventType, self, &_app_terminating_ref);
+	assert(err == noErr);
+}
+-(void)stopWatchingAppSwitching;
+{
+	if(!_app_switching_ref) return;
+	RemoveEventHandler(_app_switching_ref);
+	_app_switching_ref = NULL;
+}
+
+-(void)startWatchingMediaKeys;{
+    // Prevent having multiple mediaKeys threads
+    [self stopWatchingMediaKeys];
+    
+	[self setShouldInterceptMediaKeyEvents:YES];
+	
+	// Add an event tap to intercept the system defined media key events
+	_eventPort = CGEventTapCreate(kCGSessionEventTap,
+								  kCGHeadInsertEventTap,
+								  kCGEventTapOptionDefault,
+								  CGEventMaskBit(NX_SYSDEFINED),
+								  tapEventCallback,
+								  self);
+	assert(_eventPort != NULL);
+	
+    _eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
+	assert(_eventPortSource != NULL);
+	
+	// Let's do this in a separate thread so that a slow app doesn't lag the event tap
+	[NSThread detachNewThreadSelector:@selector(eventTapThread) toTarget:self withObject:nil];
+}
+-(void)stopWatchingMediaKeys;
+{
+	// TODO<nevyn>: Shut down thread, remove event tap port and source
+    
+    if(_tapThreadRL){
+        CFRunLoopStop(_tapThreadRL);
+        _tapThreadRL=nil;
+    }
+    
+    if(_eventPort){
+        CFMachPortInvalidate(_eventPort);
+        CFRelease(_eventPort);
+        _eventPort=nil;
+    }
+    
+    if(_eventPortSource){
+        CFRelease(_eventPortSource);
+        _eventPortSource=nil;
+    }
+}
+
+#pragma mark -
+#pragma mark Accessors
+
++(BOOL)usesGlobalMediaKeyTap
+{
+#ifdef _DEBUG
+	// breaking in gdb with a key tap inserted sometimes locks up all mouse and keyboard input forever, forcing reboot
+	return NO;
+#else
+	// XXX(nevyn): MediaKey event tap doesn't work on 10.4, feel free to figure out why if you have the energy.
+	return 
+		![[NSUserDefaults standardUserDefaults] boolForKey:kIgnoreMediaKeysDefaultsKey]
+		&& floor(NSAppKitVersionNumber) >= 949/*NSAppKitVersionNumber10_5*/;
+#endif
+}
+
++ (NSArray*)defaultMediaKeyUserBundleIdentifiers;
+{
+	return [NSArray arrayWithObjects:
+		[[NSBundle mainBundle] bundleIdentifier], // your app
+		@"com.spotify.client",
+		@"com.apple.iTunes",
+		@"com.apple.QuickTimePlayerX",
+		@"com.apple.quicktimeplayer",
+		@"com.apple.iWork.Keynote",
+		@"com.apple.iPhoto",
+		@"org.videolan.vlc",
+		@"com.apple.Aperture",
+		@"com.plexsquared.Plex",
+		@"com.soundcloud.desktop",
+		@"org.niltsh.MPlayerX",
+		@"com.ilabs.PandorasHelper",
+		@"com.mahasoftware.pandabar",
+		@"com.bitcartel.pandorajam",
+		@"org.clementine-player.clementine",
+		@"fm.last.Last.fm",
+		@"fm.last.Scrobbler",
+		@"com.beatport.BeatportPro",
+		@"com.Timenut.SongKey",
+		@"com.macromedia.fireworks", // the tap messes up their mouse input
+		@"at.justp.Theremin",
+		@"ru.ya.themblsha.YandexMusic",
+		@"com.jriver.MediaCenter18",
+		@"com.jriver.MediaCenter19",
+		@"com.jriver.MediaCenter20",
+		@"co.rackit.mate",
+		@"com.ttitt.b-music",
+		@"com.beardedspice.BeardedSpice",
+		@"com.plug.Plug",
+		@"com.plug.Plug2",
+    @"com.netease.163music",
+		nil
+	];
+}
+
+
+-(BOOL)shouldInterceptMediaKeyEvents;
+{
+	BOOL shouldIntercept = NO;
+	@synchronized(self) {
+		shouldIntercept = _shouldInterceptMediaKeyEvents;
+	}
+	return shouldIntercept;
+}
+
+-(void)pauseTapOnTapThread:(BOOL)yeahno;
+{
+	CGEventTapEnable(self->_eventPort, yeahno);
+}
+-(void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
+{
+	BOOL oldSetting;
+	@synchronized(self) {
+		oldSetting = _shouldInterceptMediaKeyEvents;
+		_shouldInterceptMediaKeyEvents = newSetting;
+	}
+	if(_tapThreadRL && oldSetting != newSetting) {
+		id grab = [self grab];
+		[grab pauseTapOnTapThread:newSetting];
+		NSTimer *timer = [NSTimer timerWithTimeInterval:0 invocation:[grab invocation] repeats:NO];
+		CFRunLoopAddTimer(_tapThreadRL, (CFRunLoopTimerRef)timer, kCFRunLoopCommonModes);
+	}
+}
+
+#pragma mark 
+#pragma mark -
+#pragma mark Event tap callbacks
+
+// Note: method called on background thread
+
+static CGEventRef tapEventCallback2(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
+{
+	SPMediaKeyTap *self = refcon;
+
+    if(type == kCGEventTapDisabledByTimeout) {
+		NSLog(@"Media key event tap was disabled by timeout");
+		CGEventTapEnable(self->_eventPort, TRUE);
+		return event;
+	} else if(type == kCGEventTapDisabledByUserInput) {
+		// Was disabled manually by -[pauseTapOnTapThread]
+		return event;
+	}
+	NSEvent *nsEvent = nil;
+	@try {
+		nsEvent = [NSEvent eventWithCGEvent:event];
+	}
+	@catch (NSException * e) {
+		NSLog(@"Strange CGEventType: %d: %@", type, e);
+		assert(0);
+		return event;
+	}
+
+	if (type != NX_SYSDEFINED || [nsEvent subtype] != SPSystemDefinedEventMediaKeys)
+		return event;
+
+	int keyCode = (([nsEvent data1] & 0xFFFF0000) >> 16);
+    if (keyCode != NX_KEYTYPE_PLAY && keyCode != NX_KEYTYPE_FAST && keyCode != NX_KEYTYPE_REWIND && keyCode != NX_KEYTYPE_PREVIOUS && keyCode != NX_KEYTYPE_NEXT)
+		return event;
+
+	if (![self shouldInterceptMediaKeyEvents])
+		return event;
+	
+	[nsEvent retain]; // matched in handleAndReleaseMediaKeyEvent:
+	[self performSelectorOnMainThread:@selector(handleAndReleaseMediaKeyEvent:) withObject:nsEvent waitUntilDone:NO];
+	
+	return NULL;
+}
+
+static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEventRef event, void *refcon)
+{
+	NSAutoreleasePool *pool = [NSAutoreleasePool new];
+	CGEventRef ret = tapEventCallback2(proxy, type, event, refcon);
+	[pool drain];
+	return ret;
+}
+
+
+// event will have been retained in the other thread
+-(void)handleAndReleaseMediaKeyEvent:(NSEvent *)event {
+	[event autorelease];
+	
+	[_delegate mediaKeyTap:self receivedMediaKeyEvent:event];
+}
+
+
+-(void)eventTapThread;
+{
+	_tapThreadRL = CFRunLoopGetCurrent();
+	CFRunLoopAddSource(_tapThreadRL, _eventPortSource, kCFRunLoopCommonModes);
+	CFRunLoopRun();
+}
+
+#pragma mark Task switching callbacks
+
+NSString *kMediaKeyUsingBundleIdentifiersDefaultsKey = @"SPApplicationsNeedingMediaKeys";
+NSString *kIgnoreMediaKeysDefaultsKey = @"SPIgnoreMediaKeys";
+
+
+
+-(void)mediaKeyAppListChanged;
+{
+	if([_mediaKeyAppList count] == 0) return;
+	
+	/*NSLog(@"--");
+	int i = 0;
+	for (NSValue *psnv in _mediaKeyAppList) {
+		ProcessSerialNumber psn; [psnv getValue:&psn];
+		NSDictionary *processInfo = [(id)ProcessInformationCopyDictionary(
+			&psn,
+			kProcessDictionaryIncludeAllInformationMask
+		) autorelease];
+		NSString *bundleIdentifier = [processInfo objectForKey:(id)kCFBundleIdentifierKey];
+		NSLog(@"%d: %@", i++, bundleIdentifier);
+	}*/
+	
+    ProcessSerialNumber mySerial, topSerial;
+	GetCurrentProcess(&mySerial);
+	[[_mediaKeyAppList objectAtIndex:0] getValue:&topSerial];
+
+	Boolean same;
+	OSErr err = SameProcess(&mySerial, &topSerial, &same);
+	[self setShouldInterceptMediaKeyEvents:(err == noErr && same)];	
+
+}
+-(void)appIsNowFrontmost:(ProcessSerialNumber)psn;
+{
+	NSValue *psnv = [NSValue valueWithBytes:&psn objCType:@encode(ProcessSerialNumber)];
+	
+	NSDictionary *processInfo = [(id)ProcessInformationCopyDictionary(
+		&psn,
+		kProcessDictionaryIncludeAllInformationMask
+	) autorelease];
+	NSString *bundleIdentifier = [processInfo objectForKey:(id)kCFBundleIdentifierKey];
+
+	NSArray *whitelistIdentifiers = [[NSUserDefaults standardUserDefaults] arrayForKey:kMediaKeyUsingBundleIdentifiersDefaultsKey];
+	if(![whitelistIdentifiers containsObject:bundleIdentifier]) return;
+
+	[_mediaKeyAppList removeObject:psnv];
+	[_mediaKeyAppList insertObject:psnv atIndex:0];
+	[self mediaKeyAppListChanged];
+}
+-(void)appTerminated:(ProcessSerialNumber)psn;
+{
+	NSValue *psnv = [NSValue valueWithBytes:&psn objCType:@encode(ProcessSerialNumber)];
+	[_mediaKeyAppList removeObject:psnv];
+	[self mediaKeyAppListChanged];
+}
+
+static pascal OSStatus appSwitched (EventHandlerCallRef nextHandler, EventRef evt, void* userData)
+{
+	SPMediaKeyTap *self = (id)userData;
+
+    ProcessSerialNumber newSerial;
+    GetFrontProcess(&newSerial);
+	
+	[self appIsNowFrontmost:newSerial];
+		
+    return CallNextEventHandler(nextHandler, evt);
+}
+
+static pascal OSStatus appTerminated (EventHandlerCallRef nextHandler, EventRef evt, void* userData)
+{
+	SPMediaKeyTap *self = (id)userData;
+	
+	ProcessSerialNumber deadPSN;
+
+	GetEventParameter(
+		evt, 
+		kEventParamProcessID, 
+		typeProcessSerialNumber, 
+		NULL, 
+		sizeof(deadPSN), 
+		NULL, 
+		&deadPSN
+	);
+
+	
+	[self appTerminated:deadPSN];
+    return CallNextEventHandler(nextHandler, evt);
+}
+
+@end
diff --git a/external/plistparser/CMakeLists.txt b/external/plistparser/CMakeLists.txt
new file mode 100644
index 0000000..f9e06e5
--- /dev/null
+++ b/external/plistparser/CMakeLists.txt
@@ -0,0 +1,8 @@
+include_directories(.)
+
+add_library(plistparser STATIC
+  plistparser.cpp
+  plistparser.h
+  plistserializer.cpp
+  plistserializer.h
+)
\ No newline at end of file
diff --git a/external/plistparser/LICENSE b/external/plistparser/LICENSE
new file mode 100644
index 0000000..2e90774
--- /dev/null
+++ b/external/plistparser/LICENSE
@@ -0,0 +1,22 @@
+Gist: this is an MIT license.  Act accordingly (basically, do whatever you want).
+It would be nice to get an email from you if you use this, but if not that's also cool.
+
+Copyright (c) 2010 Reilly Watson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/external/plistparser/plistparser.cpp b/external/plistparser/plistparser.cpp
new file mode 100644
index 0000000..76e24c0
--- /dev/null
+++ b/external/plistparser/plistparser.cpp
@@ -0,0 +1,98 @@
+// Own includes
+#include "plistparser.h"
+
+// Qt includes
+#include <QDomNode>
+#include <QDomDocument>
+#include <QDateTime>
+#include <QDebug>
+
+QVariant PListParser::parsePList(QIODevice *device) {
+	QVariantMap result;
+	QDomDocument doc;
+	QString errorMessage;
+	int errorLine;
+	int errorColumn;
+	bool success = doc.setContent(device, false, &errorMessage, &errorLine, &errorColumn);
+	if (!success) {
+		qDebug() << "PListParser Warning: Could not parse PList file!";
+		qDebug() << "Error message: " << errorMessage;
+		qDebug() << "Error line: " << errorLine;
+		qDebug() << "Error column: " << errorColumn;
+		return result;
+	}
+	QDomElement root = doc.documentElement();
+	if (root.attribute(QStringLiteral("version"), QStringLiteral("1.0")) != QLatin1String("1.0")) {
+		qDebug() << "PListParser Warning: plist is using an unknown format version, parsing might fail unexpectedly";
+	}
+	return parseElement(root.firstChild().toElement());
+}
+
+QVariant PListParser::parseElement(const QDomElement &e) {
+	QString tagName = e.tagName();
+	QVariant result;
+	if (tagName == QLatin1String("dict")) {
+		result = parseDictElement(e);
+	}
+	else if (tagName == QLatin1String("array")) {
+		result = parseArrayElement(e);
+	}
+	else if (tagName == QLatin1String("string")) {
+		result = e.text();
+	}
+	else if (tagName == QLatin1String("data")) {
+		result = QByteArray::fromBase64(e.text().toUtf8());
+	}
+	else if (tagName == QLatin1String("integer")) {
+		result = e.text().toInt();
+	}
+	else if (tagName == QLatin1String("real")) {
+		result = e.text().toFloat();
+	}
+	else if (tagName == QLatin1String("true")) {
+		result = true;
+	}
+	else if (tagName == QLatin1String("false")) {
+		result = false;
+	}
+	else if (tagName == QLatin1String("date")) {
+		result = QDateTime::fromString(e.text(), Qt::ISODate);
+	}
+	else {
+		qDebug() << "PListParser Warning: Invalid tag found: " << e.tagName() << e.text();
+	}
+	return result;
+}
+
+QVariantList PListParser::parseArrayElement(const QDomElement& element) {
+	QVariantList result;
+	QDomNodeList children = element.childNodes();
+	for (int i = 0; i < children.count(); i++) {
+		QDomNode child = children.at(i);
+		QDomElement e = child.toElement();
+		if (!e.isNull()) {
+			result.append(parseElement(e));
+		}
+	}
+	return result;
+}
+
+QVariantMap PListParser::parseDictElement(const QDomElement& element) {
+	QVariantMap result;
+	QDomNodeList children = element.childNodes();
+	QString currentKey;
+	for (int i = 0; i < children.count(); i++) {
+		QDomNode child = children.at(i);
+		QDomElement e = child.toElement();
+		if (!e.isNull()) {
+			QString tagName = e.tagName();
+			if (tagName == QLatin1String("key")) {
+				currentKey = e.text();
+			}
+			else if (!currentKey.isEmpty()) {
+				result[currentKey] = parseElement(e);
+			}
+		}
+	}
+	return result;
+}
diff --git a/external/plistparser/plistparser.h b/external/plistparser/plistparser.h
new file mode 100644
index 0000000..a1d1982
--- /dev/null
+++ b/external/plistparser/plistparser.h
@@ -0,0 +1,18 @@
+#pragma once
+
+// Qt includes
+#include <QIODevice>
+#include <QVariant>
+#include <QVariantList>
+#include <QVariantMap>
+#include <QDomElement>
+
+class PListParser {
+public:
+	static QVariant parsePList(QIODevice *device);
+private:
+	static QVariant parseElement(const QDomElement &e);
+	static QVariantList parseArrayElement(const QDomElement& node);
+	static QVariantMap parseDictElement(const QDomElement& element);
+};
+
diff --git a/external/plistparser/plistserializer.cpp b/external/plistparser/plistserializer.cpp
new file mode 100644
index 0000000..6aba024
--- /dev/null
+++ b/external/plistparser/plistserializer.cpp
@@ -0,0 +1,83 @@
+// Own includes
+#include "plistserializer.h"
+
+// Qt includes
+#include <QDomElement>
+#include <QDomDocument>
+#include <QDate>
+#include <QDateTime>
+
+static QDomElement textElement(QDomDocument& doc, const char *tagName, QString contents) {
+	QDomElement tag = doc.createElement(QString::fromLatin1(tagName));
+	tag.appendChild(doc.createTextNode(contents));
+	return tag;
+}
+
+static QDomElement serializePrimitive(QDomDocument &doc, const QVariant &variant) {
+	QDomElement result;
+	if (variant.type() == QVariant::Bool) {
+        result = doc.createElement(variant.toBool() ? QStringLiteral("true") : QStringLiteral("false"));
+	}
+	else if (variant.type() == QVariant::Date) {
+		result = textElement(doc, "date", variant.toDate().toString(Qt::ISODate));
+	}
+	else if (variant.type() == QVariant::DateTime) {
+		result = textElement(doc, "date", variant.toDateTime().toString(Qt::ISODate));
+	}
+	else if (variant.type() == QVariant::ByteArray) {
+		result = textElement(doc, "data", QString::fromLatin1(variant.toByteArray().toBase64()));
+	}
+	else if (variant.type() == QVariant::String) {
+		result = textElement(doc, "string", variant.toString());
+	}
+	else if (variant.type() == QVariant::Int) {
+		result = textElement(doc, "integer", QString::number(variant.toInt()));
+	}
+	else if (variant.canConvert(QVariant::Double)) {
+		QString num;
+		num.setNum(variant.toDouble());
+		result = textElement(doc, "real", num);
+	}
+	return result;
+}
+
+QDomElement PListSerializer::serializeElement(QDomDocument &doc, const QVariant &variant) {
+	if (variant.type() == QVariant::Map) {
+		return serializeMap(doc, variant.toMap());
+	}
+	else if (variant.type() == QVariant::List) {
+		 return serializeList(doc, variant.toList());
+	}
+	else {
+		return serializePrimitive(doc, variant);
+	}
+}
+
+QDomElement PListSerializer::serializeList(QDomDocument &doc, const QVariantList &list) {
+	QDomElement element = doc.createElement(QStringLiteral("array"));
+	foreach(QVariant item, list) {
+		element.appendChild(serializeElement(doc, item));
+	}
+	return element;
+}
+
+QDomElement PListSerializer::serializeMap(QDomDocument &doc, const QVariantMap &map) {
+	QDomElement element = doc.createElement(QStringLiteral("dict"));
+	QList<QString> keys = map.keys();
+	foreach(QString key, keys) {
+		QDomElement keyElement = textElement(doc, "key", key);
+		element.appendChild(keyElement);
+		element.appendChild(serializeElement(doc, map[key]));
+	}
+	return element;
+}
+
+QString PListSerializer::toPList(const QVariant &variant) {
+	QDomDocument document(QStringLiteral("plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\""));
+	document.appendChild(document.createProcessingInstruction(QStringLiteral("xml"), QStringLiteral("version=\"1.0\" encoding=\"UTF-8\"")));
+	QDomElement plist = document.createElement(QStringLiteral("plist"));
+	plist.setAttribute(QStringLiteral("version"), QStringLiteral("1.0"));
+	document.appendChild(plist);
+	plist.appendChild(serializeElement(document, variant));
+	return document.toString();
+}
diff --git a/external/plistparser/plistserializer.h b/external/plistparser/plistserializer.h
new file mode 100644
index 0000000..92088b9
--- /dev/null
+++ b/external/plistparser/plistserializer.h
@@ -0,0 +1,20 @@
+#pragma once
+
+// Qt includes
+#include <QIODevice>
+#include <QVariant>
+#include <QVariantList>
+#include <QVariantMap>
+#include <QDomElement>
+#include <QDomDocument>
+#include <QString>
+
+class PListSerializer {
+public:
+	static QString toPList(const QVariant &variant);
+private:
+	static QDomElement serializeElement(QDomDocument &doc, const QVariant &variant);
+	static QDomElement serializeMap(QDomDocument &doc, const QVariantMap &map);
+	static QDomElement serializeList(QDomDocument &doc, const QVariantList &list);
+};
+
diff --git a/external/qhttpserver/.gitignore b/external/qhttpserver/.gitignore
new file mode 100755
index 0000000..e7540b8
--- /dev/null
+++ b/external/qhttpserver/.gitignore
@@ -0,0 +1,30 @@
+# Folders
+build
+lib
+
+# Generated
+Makefile
+*.o
+moc_*
+
+# Docs
+docs/html
+
+# Build folders
+*/debug
+*/release
+*/*/debug
+*/*/release
+
+# Visual studio
+*.suo
+*.ncb
+*.user
+*.pdb
+*.idb
+*.vcproj
+*.vcxproj
+*.vcxproj.filters
+*.lib
+*.sln
+*.rc
diff --git a/external/qhttpserver/CMakeLists.txt b/external/qhttpserver/CMakeLists.txt
new file mode 100644
index 0000000..8663bfb
--- /dev/null
+++ b/external/qhttpserver/CMakeLists.txt
@@ -0,0 +1,8 @@
+aux_source_directory(src HTTP_SRC)
+
+include_directories(http-parser)
+add_library(http-parser STATIC http-parser/http_parser.c)
+
+set(CMAKE_AUTOMOC ON)
+add_library(qhttpserver STATIC ${HTTP_SRC} ${PARSER_SRC})
+target_link_libraries(qhttpserver http-parser)
\ No newline at end of file
diff --git a/external/qhttpserver/LICENSE b/external/qhttpserver/LICENSE
new file mode 100755
index 0000000..4cac42a
--- /dev/null
+++ b/external/qhttpserver/LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE. 
diff --git a/external/qhttpserver/README.md b/external/qhttpserver/README.md
new file mode 100755
index 0000000..97e253c
--- /dev/null
+++ b/external/qhttpserver/README.md
@@ -0,0 +1,72 @@
+QHttpServer
+===========
+
+A Qt HTTP Server - because hard-core programmers write web-apps in C++ :)
+
+It uses Joyent's [HTTP Parser](http://github.com/joyent/http-parser) and is asynchronous and does not require any inheritance.
+
+QHttpServer is available under the MIT License.
+
+**NOTE: QHttpServer is NOT fully HTTP compliant right now! DO NOT use it for
+anything complex**
+
+Installation
+------------
+
+Requires Qt 4 or Qt 5.
+
+    qmake && make && su -c 'make install'
+
+To link to your projects put this in your project's qmake project file
+
+    LIBS += -lqhttpserver
+
+By default, the installation prefix is /usr/local. To change that to /usr,
+for example, run:
+
+    qmake -r PREFIX=/usr
+
+Usage
+-----
+
+Include the headers
+
+    #include <qhttpserver.h>
+    #include <qhttprequest.h>
+    #include <qhttpresponse.h>
+
+Create a server, and connect to the signal for new requests
+
+    QHttpServer *server = new QHttpServer;
+    connect(server, SIGNAL(newRequest(QHttpRequest*, QHttpResponse*)),
+            handler, SLOT(handle(QHttpRequest*, QHttpResponse*)));
+
+    // let's go
+    server->listen(8080);
+
+In the handler, you may dispatch on routes or do whatever other things
+you want. See the API documentation for what information
+is provided about the request via the QHttpRequest object.
+
+To send data back to the browser and end the request:
+
+    void Handler::handle(QHttpRequest *req, QHttpResponse *resp)
+    {
+    	resp->setHeader("Content-Length", 11);
+    	resp->writeHead(200); // everything is OK
+    	resp->write("Hello World");
+    	resp->end();
+    }
+
+The server and request/response objects emit various signals
+and have guarantees about memory management. See the API documentation for
+these.
+
+Contribute
+----------
+
+Feel free to file issues, branch and send pull requests. If you plan to work on a major feature (say WebSocket support), please run it by me first by filing an issue! qhttpserver has a narrow scope and API and I'd like to keep it that way, so a thousand line patch that implements the kitchen sink is unlikely to be accepted.
+
+- Nikhil Marathe (maintainer)
+
+Everybody who has ever contributed shows up in [Contributors](https://github.com/nikhilm/qhttpserver/graphs/contributors).
diff --git a/external/qhttpserver/TODO b/external/qhttpserver/TODO
new file mode 100755
index 0000000..d376a28
--- /dev/null
+++ b/external/qhttpserver/TODO
@@ -0,0 +1,7 @@
+* Expect & Continue stuff
+* Chunked encoding support
+* Only copy over public headers etc.
+* connection object should connect to QHttpResponse::destroyed()
+and stop pushing data into it or whatever if the object is destroyed.
+* response object should keep track of emitting done() and not accept writes after that
+* handle encoding in response write and end
diff --git a/external/qhttpserver/docs/Doxyfile b/external/qhttpserver/docs/Doxyfile
new file mode 100755
index 0000000..ebc46e7
--- /dev/null
+++ b/external/qhttpserver/docs/Doxyfile
@@ -0,0 +1,2314 @@
+# Doxyfile 1.8.5
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+# 
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+# 
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = QHttpServer
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 0.1
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "A Qt based asynchronous Http Server"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = ./
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-
+# Traditional, Croatian, Czech, Danish, Dutch, English, Esperanto, Farsi,
+# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en,
+# Korean, Korean-en, Latvian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+# 
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+# 
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = YES
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+# 
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = YES
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = 
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C.
+# 
+# Note For files without extension you can use no_extension as a placeholder.
+# 
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+# 
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = NO
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = NO
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+# 
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = 
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+# 
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = pages \
+                         ../src
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = *.cpp \
+                         *.inl \
+                         *.h \
+                         *.dox
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+# 
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = 
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+# 
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = ui_*.h \
+                         moc_*
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+# 
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = ../examples
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+# 
+# <filter> <input-file>
+# 
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+# 
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS = 
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+# 
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+# 
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+# 
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+# 
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more acurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+# 
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = 
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       = 
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+# 
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               = 
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           = 
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     = 
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+# 
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+# 
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     = 
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       = 
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+# 
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+# 
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+# 
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       = 
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     = 
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+# 
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+# 
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+# 
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           = 
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+# 
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+# 
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+# 
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_SCHEMA             = 
+
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_DTD                = 
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+# 
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            = 
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+# 
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+# 
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+# 
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           = 
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+# 
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/external/qhttpserver/docs/pages/examples.dox b/external/qhttpserver/docs/pages/examples.dox
new file mode 100755
index 0000000..788dfe8
--- /dev/null
+++ b/external/qhttpserver/docs/pages/examples.dox
@@ -0,0 +1,10 @@
+/**
+
+@example helloworld/helloworld.cpp
+@example helloworld/helloworld.h
+@example greeting/greeting.cpp
+@example greeting/greeting.h
+@example bodydata/bodydata.cpp
+@example bodydata/bodydata.h
+
+*/
\ No newline at end of file
diff --git a/external/qhttpserver/docs/pages/main-page.dox b/external/qhttpserver/docs/pages/main-page.dox
new file mode 100755
index 0000000..8b2fc0b
--- /dev/null
+++ b/external/qhttpserver/docs/pages/main-page.dox
@@ -0,0 +1,105 @@
+/**
+
+@mainpage %QHttpServer Documentation
+
+@section introduction Introduction
+
+%QHttpServer is a easy to use, fast and light-weight
+HTTP Server suitable for C++ web applications backed
+by Qt. Since C++ web applications are pretty uncommon
+the market for this project is pretty low.
+
+But integrating this with a module like QtScript and using it to write
+JavaScript web applications is a tempting possibility, and something that
+I demonstrated at <a href="http://conf.kde.in">conf.kde.in 2011</a>. The slides
+can be found on <a href="https://github.com/nikhilm/confkdein11">Github</a>.
+
+%QHttpServer uses a signal-slots based mechanism
+for all communication, so no inheritance is required.
+It tries to be as asynchronous as possible, to the
+extent that request body data is also delivered as and
+when it is received over the socket via signals. This
+kind of programming may take some getting used to.
+
+%QHttpServer is backed by <a href="http://github.com/ry/http-parser">Ryan
+Dahl's secure and fast http parser</a> which makes it streaming
+till the lowest level.
+
+@section usage Usage
+
+Using %QHttpServer is very simple. Simply create a QHttpServer,
+connect a slot to the newRequest() signal and use the request and
+response objects.
+See the QHttpServer class documentation for an example.
+
+@section memorymanagement Memory Management
+
+The QHttpRequest and QHttpResponse deletion policies
+are such.
+
+QHttpRequest is <b>never</b> deleted by %QHttpServer.
+Since it is not possible to determine till what point the application
+may want access to its data, it is up to the application to delete it.
+A recommended way to handle this is to create a new responder object for
+every request and to delete the request in that object's destructor. The
+object itself can be deleted by connecting to QHttpResponse's done()
+slot as explained below.
+
+You should <b>not</b> delete the QHttpRequest object until it
+has emitted an QHttpRequest::end() signal.
+
+QHttpResponse queues itself up for auto-deletion once the application
+calls its end() method. Once the data has been flushed to the underlying
+socket, the object will emit a QHttpResponse::done() signal before queueing itself up
+for deletion. You should <b>not</b> interact with the response
+object once it has emitted QHttpResponse::done() although actual deletion does not
+happen until QHttpResponse::destroyed() is emitted.
+QHttpResponse::done() serves as a useful way to handle memory management of the
+application itself. For example:
+
+@code
+
+MyApp::MyApp() : QObject()
+{
+    QHttpServer *server = new QHttpServer(this);
+    connect(server, SIGNAL(newRequest(...)), this, SLOT(handle(...)));
+    s.listen(8080);
+}
+
+void MyApp::handle(QHttpRequest *request, QHttpResponse *response)
+{
+    if (request->path() == x) // Match a route
+        new Responder(request, response);
+    else
+        new PageNotFound(request, response);
+}
+
+...
+
+Responder::Responder(QHttpRequest *request, QHttpResponse *response)
+{
+    m_request = request;
+
+    connect(request, SIGNAL(end()), response, SLOT(end()));
+  
+    // Once the request is complete, the response is sent.
+    // When the response ends, it deletes itself
+    // the Responder object connects to done()
+    // which will lead to it being deleted
+    // and this will delete the request.
+    // So all 3 are properly deleted.
+    connect(response, SIGNAL(done()), this, SLOT(deleteLater()));
+
+    response->writeHead(200);
+    response->write("Quitting soon");
+}
+
+Responder::~Responder()
+{
+    delete m_request;
+    m_request = 0;
+}
+
+@endcode
+
+*/
\ No newline at end of file
diff --git a/external/qhttpserver/examples/bodydata/bodydata.cpp b/external/qhttpserver/examples/bodydata/bodydata.cpp
new file mode 100755
index 0000000..1a2c7a1
--- /dev/null
+++ b/external/qhttpserver/examples/bodydata/bodydata.cpp
@@ -0,0 +1,76 @@
+#include "bodydata.h"
+
+#include <QCoreApplication>
+#include <QRegExp>
+#include <QStringList>
+#include <QDebug>
+
+#include <qhttpserver.h>
+#include <qhttprequest.h>
+#include <qhttpresponse.h>
+
+/// BodyData
+
+BodyData::BodyData()
+{
+    QHttpServer *server = new QHttpServer(this);
+    connect(server, SIGNAL(newRequest(QHttpRequest*, QHttpResponse*)),
+        this, SLOT(handleRequest(QHttpRequest*, QHttpResponse*)));
+        
+    server->listen(QHostAddress::Any, 8080);
+}
+
+void BodyData::handleRequest(QHttpRequest *req, QHttpResponse *resp)
+{
+    new Responder(req, resp);
+}
+
+/// Responder
+
+Responder::Responder(QHttpRequest *req, QHttpResponse *resp)
+    : m_req(req)
+    , m_resp(resp)
+{
+    QRegExp exp("^/user/([a-z]+$)");
+    if (exp.indexIn(req->path()) == -1)
+    {
+        resp->writeHead(403);
+        resp->end(QByteArray("You aren't allowed here!"));
+        /// @todo There should be a way to tell request to stop streaming data
+        return;
+    }
+
+    resp->setHeader("Content-Type", "text/html");
+    resp->writeHead(200);
+    
+    QString name = exp.capturedTexts()[1];
+    QString bodyStart = tr("<html><head><title>BodyData App</title></head><body><h1>Hello %1!</h1><p>").arg(name);
+    resp->write(bodyStart.toUtf8());
+
+    connect(req, SIGNAL(data(const QByteArray&)), this, SLOT(accumulate(const QByteArray&)));
+    connect(req, SIGNAL(end()), this, SLOT(reply()));
+    connect(m_resp, SIGNAL(done()), this, SLOT(deleteLater()));
+}
+
+Responder::~Responder()
+{
+}
+
+void Responder::accumulate(const QByteArray &data)
+{
+    m_resp->write(data);
+}
+
+void Responder::reply()
+{
+    m_resp->end(QByteArray("</p></body></html>"));
+}
+
+/// main
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    BodyData bodydata;
+    app.exec();
+}
diff --git a/external/qhttpserver/examples/bodydata/bodydata.h b/external/qhttpserver/examples/bodydata/bodydata.h
new file mode 100755
index 0000000..8fed37d
--- /dev/null
+++ b/external/qhttpserver/examples/bodydata/bodydata.h
@@ -0,0 +1,39 @@
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+#include <QScopedPointer>
+
+/// BodyData
+
+class BodyData : public QObject
+{
+    Q_OBJECT
+
+public:
+    BodyData();
+
+private slots:
+    void handleRequest(QHttpRequest *req, QHttpResponse *resp);
+};
+
+/// Responder
+
+class Responder : public QObject
+{
+    Q_OBJECT
+
+public:
+    Responder(QHttpRequest *req, QHttpResponse *resp);
+    ~Responder();
+
+signals:
+    void done();
+
+private slots:
+    void accumulate(const QByteArray &data);
+    void reply();
+
+private:
+    QScopedPointer<QHttpRequest> m_req;
+    QHttpResponse *m_resp;
+};
diff --git a/external/qhttpserver/examples/bodydata/bodydata.pro b/external/qhttpserver/examples/bodydata/bodydata.pro
new file mode 100755
index 0000000..46d15d9
--- /dev/null
+++ b/external/qhttpserver/examples/bodydata/bodydata.pro
@@ -0,0 +1,19 @@
+TARGET = bodydata
+
+QT += network
+QT -= gui
+
+CONFIG += debug
+
+INCLUDEPATH += ../../src
+LIBS += -L../../lib
+
+win32 {
+    debug: LIBS += -lqhttpserverd
+    else: LIBS += -lqhttpserver
+} else {
+    LIBS += -lqhttpserver
+}
+
+SOURCES = bodydata.cpp
+HEADERS = bodydata.h
diff --git a/external/qhttpserver/examples/examples.pro b/external/qhttpserver/examples/examples.pro
new file mode 100755
index 0000000..b6e7a08
--- /dev/null
+++ b/external/qhttpserver/examples/examples.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+SUBDIRS += \
+helloworld\
+greeting\
+bodydata\
diff --git a/external/qhttpserver/examples/greeting/greeting.cpp b/external/qhttpserver/examples/greeting/greeting.cpp
new file mode 100755
index 0000000..4a2550e
--- /dev/null
+++ b/external/qhttpserver/examples/greeting/greeting.cpp
@@ -0,0 +1,48 @@
+#include "greeting.h"
+
+#include <QCoreApplication>
+#include <QRegExp>
+#include <QStringList>
+
+#include <qhttpserver.h>
+#include <qhttprequest.h>
+#include <qhttpresponse.h>
+
+/// Greeting
+
+Greeting::Greeting()
+{
+    QHttpServer *server = new QHttpServer(this);
+    connect(server, SIGNAL(newRequest(QHttpRequest*, QHttpResponse*)),
+            this, SLOT(handleRequest(QHttpRequest*, QHttpResponse*)));
+            
+    server->listen(QHostAddress::Any, 8080);
+}
+
+void Greeting::handleRequest(QHttpRequest *req, QHttpResponse *resp)
+{
+    QRegExp exp("^/user/([a-z]+)$");
+    if( exp.indexIn(req->path()) != -1 )
+    {
+        resp->setHeader("Content-Type", "text/html");
+        resp->writeHead(200);
+        
+        QString name = exp.capturedTexts()[1];
+        QString body = tr("<html><head><title>Greeting App</title></head><body><h1>Hello %1!</h1></body></html>");
+        resp->end(body.arg(name).toUtf8());
+    }
+    else
+    {
+        resp->writeHead(403);
+        resp->end(QByteArray("You aren't allowed here!"));
+    }
+}
+
+/// main
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    Greeting greeting;
+    app.exec();
+}
diff --git a/external/qhttpserver/examples/greeting/greeting.h b/external/qhttpserver/examples/greeting/greeting.h
new file mode 100755
index 0000000..ed26fbc
--- /dev/null
+++ b/external/qhttpserver/examples/greeting/greeting.h
@@ -0,0 +1,16 @@
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+
+/// Greeting
+
+class Greeting : public QObject
+{
+    Q_OBJECT
+
+public:
+    Greeting();
+
+private slots:
+    void handleRequest(QHttpRequest *req, QHttpResponse *resp);
+};
diff --git a/external/qhttpserver/examples/greeting/greeting.pro b/external/qhttpserver/examples/greeting/greeting.pro
new file mode 100755
index 0000000..ff2089a
--- /dev/null
+++ b/external/qhttpserver/examples/greeting/greeting.pro
@@ -0,0 +1,19 @@
+TARGET = greeting
+
+QT += network
+QT -= gui
+
+CONFIG += debug
+
+INCLUDEPATH += ../../src
+LIBS += -L../../lib
+
+win32 {
+    debug: LIBS += -lqhttpserverd
+    else: LIBS += -lqhttpserver
+} else {
+    LIBS += -lqhttpserver
+}
+
+SOURCES = greeting.cpp
+HEADERS = greeting.h
diff --git a/external/qhttpserver/examples/helloworld/helloworld.cpp b/external/qhttpserver/examples/helloworld/helloworld.cpp
new file mode 100755
index 0000000..428eacd
--- /dev/null
+++ b/external/qhttpserver/examples/helloworld/helloworld.cpp
@@ -0,0 +1,37 @@
+#include "helloworld.h"
+
+#include <QCoreApplication>
+
+#include <qhttpserver.h>
+#include <qhttprequest.h>
+#include <qhttpresponse.h>
+
+/// HelloWorld
+
+HelloWorld::HelloWorld()
+{
+    QHttpServer *server = new QHttpServer(this);
+    connect(server, SIGNAL(newRequest(QHttpRequest*, QHttpResponse*)),
+            this, SLOT(handleRequest(QHttpRequest*, QHttpResponse*)));
+
+    server->listen(QHostAddress::Any, 8080);
+}
+
+void HelloWorld::handleRequest(QHttpRequest *req, QHttpResponse *resp)
+{
+    Q_UNUSED(req);
+
+    QByteArray body = "Hello World";
+    resp->setHeader("Content-Length", QString::number(body.size()));
+    resp->writeHead(200);
+    resp->end(body);
+}
+
+/// main
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    HelloWorld hello;
+    app.exec();
+}
diff --git a/external/qhttpserver/examples/helloworld/helloworld.h b/external/qhttpserver/examples/helloworld/helloworld.h
new file mode 100755
index 0000000..7e6239b
--- /dev/null
+++ b/external/qhttpserver/examples/helloworld/helloworld.h
@@ -0,0 +1,16 @@
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+
+/// HelloWorld
+
+class HelloWorld : public QObject
+{
+    Q_OBJECT
+
+public:
+    HelloWorld();
+
+private slots:
+    void handleRequest(QHttpRequest *req, QHttpResponse *resp);
+};
diff --git a/external/qhttpserver/examples/helloworld/helloworld.pro b/external/qhttpserver/examples/helloworld/helloworld.pro
new file mode 100755
index 0000000..1ca0cbc
--- /dev/null
+++ b/external/qhttpserver/examples/helloworld/helloworld.pro
@@ -0,0 +1,19 @@
+TARGET = helloworld
+
+QT += network
+QT -= gui
+
+CONFIG += debug
+
+INCLUDEPATH += ../../src
+LIBS += -L../../lib
+
+win32 {
+    debug: LIBS += -lqhttpserverd
+    else: LIBS += -lqhttpserver
+} else {
+    LIBS += -lqhttpserver
+}
+
+SOURCES = helloworld.cpp
+HEADERS = helloworld.h
diff --git a/external/qhttpserver/http-parser/.gitignore b/external/qhttpserver/http-parser/.gitignore
new file mode 100755
index 0000000..32cb51b
--- /dev/null
+++ b/external/qhttpserver/http-parser/.gitignore
@@ -0,0 +1,28 @@
+/out/
+core
+tags
+*.o
+test
+test_g
+test_fast
+bench
+url_parser
+parsertrace
+parsertrace_g
+*.mk
+*.Makefile
+*.so.*
+*.a
+
+
+# Visual Studio uglies
+*.suo
+*.sln
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+*.opensdf
+*.ncrunchsolution*
+*.sdf
+*.vsp
+*.psess
diff --git a/external/qhttpserver/http-parser/.mailmap b/external/qhttpserver/http-parser/.mailmap
new file mode 100644
index 0000000..278d141
--- /dev/null
+++ b/external/qhttpserver/http-parser/.mailmap
@@ -0,0 +1,8 @@
+# update AUTHORS with:
+#   git log --all --reverse --format='%aN <%aE>' | perl -ne 'BEGIN{print "# Authors ordered by first contribution.\n"} print unless $h{$_}; $h{$_} = 1' > AUTHORS
+Ryan Dahl <ry@tinyclouds.org>
+Salman Haq <salman.haq@asti-usa.com>
+Simon Zimmermann <simonz05@gmail.com>
+Thomas LE ROUX <thomas@november-eleven.fr> LE ROUX Thomas <thomas@procheo.fr>
+Thomas LE ROUX <thomas@november-eleven.fr> Thomas LE ROUX <thomas@procheo.fr>
+Fedor Indutny <fedor@indutny.com>
diff --git a/external/qhttpserver/http-parser/.travis.yml b/external/qhttpserver/http-parser/.travis.yml
new file mode 100644
index 0000000..4b038e6
--- /dev/null
+++ b/external/qhttpserver/http-parser/.travis.yml
@@ -0,0 +1,13 @@
+language: c
+
+compiler:
+  - clang
+  - gcc
+
+script:
+  - "make"
+
+notifications:
+  email: false
+  irc:
+    - "irc.freenode.net#node-ci"
diff --git a/external/qhttpserver/http-parser/AUTHORS b/external/qhttpserver/http-parser/AUTHORS
new file mode 100755
index 0000000..8e2df1d
--- /dev/null
+++ b/external/qhttpserver/http-parser/AUTHORS
@@ -0,0 +1,67 @@
+# Authors ordered by first contribution.
+Ryan Dahl <ry@tinyclouds.org>
+Jeremy Hinegardner <jeremy@hinegardner.org>
+Sergey Shepelev <temotor@gmail.com>
+Joe Damato <ice799@gmail.com>
+tomika <tomika_nospam@freemail.hu>
+Phoenix Sol <phoenix@burninglabs.com>
+Cliff Frey <cliff@meraki.com>
+Ewen Cheslack-Postava <ewencp@cs.stanford.edu>
+Santiago Gala <sgala@apache.org>
+Tim Becker <tim.becker@syngenio.de>
+Jeff Terrace <jterrace@gmail.com>
+Ben Noordhuis <info@bnoordhuis.nl>
+Nathan Rajlich <nathan@tootallnate.net>
+Mark Nottingham <mnot@mnot.net>
+Aman Gupta <aman@tmm1.net>
+Tim Becker <tim.becker@kuriositaet.de>
+Sean Cunningham <sean.cunningham@mandiant.com>
+Peter Griess <pg@std.in>
+Salman Haq <salman.haq@asti-usa.com>
+Cliff Frey <clifffrey@gmail.com>
+Jon Kolb <jon@b0g.us>
+Fouad Mardini <f.mardini@gmail.com>
+Paul Querna <pquerna@apache.org>
+Felix Geisendörfer <felix@debuggable.com>
+koichik <koichik@improvement.jp>
+Andre Caron <andre.l.caron@gmail.com>
+Ivo Raisr <ivosh@ivosh.net>
+James McLaughlin <jamie@lacewing-project.org>
+David Gwynne <loki@animata.net>
+Thomas LE ROUX <thomas@november-eleven.fr>
+Randy Rizun <rrizun@ortivawireless.com>
+Andre Louis Caron <andre.louis.caron@usherbrooke.ca>
+Simon Zimmermann <simonz05@gmail.com>
+Erik Dubbelboer <erik@dubbelboer.com>
+Martell Malone <martellmalone@gmail.com>
+Bertrand Paquet <bpaquet@octo.com>
+BogDan Vatra <bogdan@kde.org>
+Peter Faiman <peter@thepicard.org>
+Corey Richardson <corey@octayn.net>
+Tóth Tamás <tomika_nospam@freemail.hu>
+Cam Swords <cam.swords@gmail.com>
+Chris Dickinson <christopher.s.dickinson@gmail.com>
+Uli Köhler <ukoehler@btronik.de>
+Charlie Somerville <charlie@charliesomerville.com>
+Patrik Stutz <patrik.stutz@gmail.com>
+Fedor Indutny <fedor.indutny@gmail.com>
+runner <runner.mei@gmail.com>
+Alexis Campailla <alexis@janeasystems.com>
+David Wragg <david@wragg.org>
+Vinnie Falco <vinnie.falco@gmail.com>
+Alex Butum <alexbutum@linux.com>
+Rex Feng <rexfeng@gmail.com>
+Alex Kocharin <alex@kocharin.ru>
+Mark Koopman <markmontymark@yahoo.com>
+Helge Heß <me@helgehess.eu>
+Alexis La Goutte <alexis.lagoutte@gmail.com>
+George Miroshnykov <george.miroshnykov@gmail.com>
+Maciej Małecki <me@mmalecki.com>
+Marc O'Morain <github.com@marcomorain.com>
+Jeff Pinner <jpinner@twitter.com>
+Timothy J Fontaine <tjfontaine@gmail.com>
+Akagi201 <akagi201@gmail.com>
+Romain Giraud <giraud.romain@gmail.com>
+Jay Satiro <raysatiro@yahoo.com>
+Arne Steen <Arne.Steen@gmx.de>
+Kjell Schubert <kjell.schubert@gmail.com>
diff --git a/external/qhttpserver/http-parser/CONTRIBUTIONS b/external/qhttpserver/http-parser/CONTRIBUTIONS
new file mode 100755
index 0000000..11ba31e
--- /dev/null
+++ b/external/qhttpserver/http-parser/CONTRIBUTIONS
@@ -0,0 +1,4 @@
+Contributors must agree to the Contributor License Agreement before patches
+can be accepted.
+
+http://spreadsheets2.google.com/viewform?hl=en&formkey=dDJXOGUwbzlYaWM4cHN1MERwQS1CSnc6MQ
diff --git a/external/qhttpserver/http-parser/LICENSE-MIT b/external/qhttpserver/http-parser/LICENSE-MIT
new file mode 100755
index 0000000..58010b3
--- /dev/null
+++ b/external/qhttpserver/http-parser/LICENSE-MIT
@@ -0,0 +1,23 @@
+http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
+Igor Sysoev.
+
+Additional changes are licensed under the same terms as NGINX and
+copyright Joyent, Inc. and other Node contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE. 
diff --git a/external/qhttpserver/http-parser/README.md b/external/qhttpserver/http-parser/README.md
new file mode 100755
index 0000000..7c54dd4
--- /dev/null
+++ b/external/qhttpserver/http-parser/README.md
@@ -0,0 +1,183 @@
+HTTP Parser
+===========
+
+[![Build Status](https://travis-ci.org/joyent/http-parser.png?branch=master)](https://travis-ci.org/joyent/http-parser)
+
+This is a parser for HTTP messages written in C. It parses both requests and
+responses. The parser is designed to be used in performance HTTP
+applications. It does not make any syscalls nor allocations, it does not
+buffer data, it can be interrupted at anytime. Depending on your
+architecture, it only requires about 40 bytes of data per message
+stream (in a web server that is per connection).
+
+Features:
+
+  * No dependencies
+  * Handles persistent streams (keep-alive).
+  * Decodes chunked encoding.
+  * Upgrade support
+  * Defends against buffer overflow attacks.
+
+The parser extracts the following information from HTTP messages:
+
+  * Header fields and values
+  * Content-Length
+  * Request method
+  * Response status code
+  * Transfer-Encoding
+  * HTTP version
+  * Request URL
+  * Message body
+
+
+Usage
+-----
+
+One `http_parser` object is used per TCP connection. Initialize the struct
+using `http_parser_init()` and set the callbacks. That might look something
+like this for a request parser:
+```c
+http_parser_settings settings;
+settings.on_url = my_url_callback;
+settings.on_header_field = my_header_field_callback;
+/* ... */
+
+http_parser *parser = malloc(sizeof(http_parser));
+http_parser_init(parser, HTTP_REQUEST);
+parser->data = my_socket;
+```
+
+When data is received on the socket execute the parser and check for errors.
+
+```c
+size_t len = 80*1024, nparsed;
+char buf[len];
+ssize_t recved;
+
+recved = recv(fd, buf, len, 0);
+
+if (recved < 0) {
+  /* Handle error. */
+}
+
+/* Start up / continue the parser.
+ * Note we pass recved==0 to signal that EOF has been received.
+ */
+nparsed = http_parser_execute(parser, &settings, buf, recved);
+
+if (parser->upgrade) {
+  /* handle new protocol */
+} else if (nparsed != recved) {
+  /* Handle error. Usually just close the connection. */
+}
+```
+
+HTTP needs to know where the end of the stream is. For example, sometimes
+servers send responses without Content-Length and expect the client to
+consume input (for the body) until EOF. To tell http_parser about EOF, give
+`0` as the fourth parameter to `http_parser_execute()`. Callbacks and errors
+can still be encountered during an EOF, so one must still be prepared
+to receive them.
+
+Scalar valued message information such as `status_code`, `method`, and the
+HTTP version are stored in the parser structure. This data is only
+temporally stored in `http_parser` and gets reset on each new message. If
+this information is needed later, copy it out of the structure during the
+`headers_complete` callback.
+
+The parser decodes the transfer-encoding for both requests and responses
+transparently. That is, a chunked encoding is decoded before being sent to
+the on_body callback.
+
+
+The Special Problem of Upgrade
+------------------------------
+
+HTTP supports upgrading the connection to a different protocol. An
+increasingly common example of this is the Web Socket protocol which sends
+a request like
+
+        GET /demo HTTP/1.1
+        Upgrade: WebSocket
+        Connection: Upgrade
+        Host: example.com
+        Origin: http://example.com
+        WebSocket-Protocol: sample
+
+followed by non-HTTP data.
+
+(See http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-75 for more
+information the Web Socket protocol.)
+
+To support this, the parser will treat this as a normal HTTP message without a
+body, issuing both on_headers_complete and on_message_complete callbacks. However
+http_parser_execute() will stop parsing at the end of the headers and return.
+
+The user is expected to check if `parser->upgrade` has been set to 1 after
+`http_parser_execute()` returns. Non-HTTP data begins at the buffer supplied
+offset by the return value of `http_parser_execute()`.
+
+
+Callbacks
+---------
+
+During the `http_parser_execute()` call, the callbacks set in
+`http_parser_settings` will be executed. The parser maintains state and
+never looks behind, so buffering the data is not necessary. If you need to
+save certain data for later usage, you can do that from the callbacks.
+
+There are two types of callbacks:
+
+* notification `typedef int (*http_cb) (http_parser*);`
+    Callbacks: on_message_begin, on_headers_complete, on_message_complete.
+* data `typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);`
+    Callbacks: (requests only) on_url,
+               (common) on_header_field, on_header_value, on_body;
+
+Callbacks must return 0 on success. Returning a non-zero value indicates
+error to the parser, making it exit immediately.
+
+In case you parse HTTP message in chunks (i.e. `read()` request line
+from socket, parse, read half headers, parse, etc) your data callbacks
+may be called more than once. Http-parser guarantees that data pointer is only
+valid for the lifetime of callback. You can also `read()` into a heap allocated
+buffer to avoid copying memory around if this fits your application.
+
+Reading headers may be a tricky task if you read/parse headers partially.
+Basically, you need to remember whether last header callback was field or value
+and apply the following logic:
+
+    (on_header_field and on_header_value shortened to on_h_*)
+     ------------------------ ------------ --------------------------------------------
+    | State (prev. callback) | Callback   | Description/action                         |
+     ------------------------ ------------ --------------------------------------------
+    | nothing (first call)   | on_h_field | Allocate new buffer and copy callback data |
+    |                        |            | into it                                    |
+     ------------------------ ------------ --------------------------------------------
+    | value                  | on_h_field | New header started.                        |
+    |                        |            | Copy current name,value buffers to headers |
+    |                        |            | list and allocate new buffer for new name  |
+     ------------------------ ------------ --------------------------------------------
+    | field                  | on_h_field | Previous name continues. Reallocate name   |
+    |                        |            | buffer and append callback data to it      |
+     ------------------------ ------------ --------------------------------------------
+    | field                  | on_h_value | Value for current header started. Allocate |
+    |                        |            | new buffer and copy callback data to it    |
+     ------------------------ ------------ --------------------------------------------
+    | value                  | on_h_value | Value continues. Reallocate value buffer   |
+    |                        |            | and append callback data to it             |
+     ------------------------ ------------ --------------------------------------------
+
+
+Parsing URLs
+------------
+
+A simplistic zero-copy URL parser is provided as `http_parser_parse_url()`.
+Users of this library may wish to use it to parse URLs constructed from
+consecutive `on_url` callbacks.
+
+See examples of reading in headers:
+
+* [partial example](http://gist.github.com/155877) in C
+* [from http-parser tests](http://github.com/joyent/http-parser/blob/37a0ff8/test.c#L403) in C
+* [from Node library](http://github.com/joyent/node/blob/842eaf4/src/http.js#L284) in Javascript
diff --git a/external/qhttpserver/http-parser/bench.c b/external/qhttpserver/http-parser/bench.c
new file mode 100644
index 0000000..5b452fa
--- /dev/null
+++ b/external/qhttpserver/http-parser/bench.c
@@ -0,0 +1,111 @@
+/* Copyright Fedor Indutny. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#include "http_parser.h"
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/time.h>
+
+static const char data[] =
+    "POST /joyent/http-parser HTTP/1.1\r\n"
+    "Host: github.com\r\n"
+    "DNT: 1\r\n"
+    "Accept-Encoding: gzip, deflate, sdch\r\n"
+    "Accept-Language: ru-RU,ru;q=0.8,en-US;q=0.6,en;q=0.4\r\n"
+    "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) "
+        "AppleWebKit/537.36 (KHTML, like Gecko) "
+        "Chrome/39.0.2171.65 Safari/537.36\r\n"
+    "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,"
+        "image/webp,*/*;q=0.8\r\n"
+    "Referer: https://github.com/joyent/http-parser\r\n"
+    "Connection: keep-alive\r\n"
+    "Transfer-Encoding: chunked\r\n"
+    "Cache-Control: max-age=0\r\n\r\nb\r\nhello world\r\n0\r\n\r\n";
+static const size_t data_len = sizeof(data) - 1;
+
+static int on_info(http_parser* p) {
+  return 0;
+}
+
+
+static int on_data(http_parser* p, const char *at, size_t length) {
+  return 0;
+}
+
+static http_parser_settings settings = {
+  .on_message_begin = on_info,
+  .on_headers_complete = on_info,
+  .on_message_complete = on_info,
+  .on_header_field = on_data,
+  .on_header_value = on_data,
+  .on_url = on_data,
+  .on_status = on_data,
+  .on_body = on_data
+};
+
+int bench(int iter_count, int silent) {
+  struct http_parser parser;
+  int i;
+  int err;
+  struct timeval start;
+  struct timeval end;
+  float rps;
+
+  if (!silent) {
+    err = gettimeofday(&start, NULL);
+    assert(err == 0);
+  }
+
+  for (i = 0; i < iter_count; i++) {
+    size_t parsed;
+    http_parser_init(&parser, HTTP_REQUEST);
+
+    parsed = http_parser_execute(&parser, &settings, data, data_len);
+    assert(parsed == data_len);
+  }
+
+  if (!silent) {
+    err = gettimeofday(&end, NULL);
+    assert(err == 0);
+
+    fprintf(stdout, "Benchmark result:\n");
+
+    rps = (float) (end.tv_sec - start.tv_sec) +
+          (end.tv_usec - start.tv_usec) * 1e-6f;
+    fprintf(stdout, "Took %f seconds to run\n", rps);
+
+    rps = (float) iter_count / rps;
+    fprintf(stdout, "%f req/sec\n", rps);
+    fflush(stdout);
+  }
+
+  return 0;
+}
+
+int main(int argc, char** argv) {
+  if (argc == 2 && strcmp(argv[1], "infinite") == 0) {
+    for (;;)
+      bench(5000000, 1);
+    return 0;
+  } else {
+    return bench(5000000, 0);
+  }
+}
diff --git a/external/qhttpserver/http-parser/contrib/parsertrace.c b/external/qhttpserver/http-parser/contrib/parsertrace.c
new file mode 100644
index 0000000..e715368
--- /dev/null
+++ b/external/qhttpserver/http-parser/contrib/parsertrace.c
@@ -0,0 +1,160 @@
+/* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev
+ *
+ * Additional changes are licensed under the same terms as NGINX and
+ * copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/* Dump what the parser finds to stdout as it happen */
+
+#include "http_parser.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int on_message_begin(http_parser* _) {
+  (void)_;
+  printf("\n***MESSAGE BEGIN***\n\n");
+  return 0;
+}
+
+int on_headers_complete(http_parser* _) {
+  (void)_;
+  printf("\n***HEADERS COMPLETE***\n\n");
+  return 0;
+}
+
+int on_message_complete(http_parser* _) {
+  (void)_;
+  printf("\n***MESSAGE COMPLETE***\n\n");
+  return 0;
+}
+
+int on_url(http_parser* _, const char* at, size_t length) {
+  (void)_;
+  printf("Url: %.*s\n", (int)length, at);
+  return 0;
+}
+
+int on_header_field(http_parser* _, const char* at, size_t length) {
+  (void)_;
+  printf("Header field: %.*s\n", (int)length, at);
+  return 0;
+}
+
+int on_header_value(http_parser* _, const char* at, size_t length) {
+  (void)_;
+  printf("Header value: %.*s\n", (int)length, at);
+  return 0;
+}
+
+int on_body(http_parser* _, const char* at, size_t length) {
+  (void)_;
+  printf("Body: %.*s\n", (int)length, at);
+  return 0;
+}
+
+void usage(const char* name) {
+  fprintf(stderr,
+          "Usage: %s $type $filename\n"
+          "  type: -x, where x is one of {r,b,q}\n"
+          "  parses file as a Response, reQuest, or Both\n",
+          name);
+  exit(EXIT_FAILURE);
+}
+
+int main(int argc, char* argv[]) {
+  enum http_parser_type file_type;
+
+  if (argc != 3) {
+    usage(argv[0]);
+  }
+
+  char* type = argv[1];
+  if (type[0] != '-') {
+    usage(argv[0]);
+  }
+
+  switch (type[1]) {
+    /* in the case of "-", type[1] will be NUL */
+    case 'r':
+      file_type = HTTP_RESPONSE;
+      break;
+    case 'q':
+      file_type = HTTP_REQUEST;
+      break;
+    case 'b':
+      file_type = HTTP_BOTH;
+      break;
+    default:
+      usage(argv[0]);
+  }
+
+  char* filename = argv[2];
+  FILE* file = fopen(filename, "r");
+  if (file == NULL) {
+    perror("fopen");
+    goto fail;
+  }
+
+  fseek(file, 0, SEEK_END);
+  long file_length = ftell(file);
+  if (file_length == -1) {
+    perror("ftell");
+    goto fail;
+  }
+  fseek(file, 0, SEEK_SET);
+
+  char* data = malloc(file_length);
+  if (fread(data, 1, file_length, file) != (size_t)file_length) {
+    fprintf(stderr, "couldn't read entire file\n");
+    free(data);
+    goto fail;
+  }
+
+  http_parser_settings settings;
+  memset(&settings, 0, sizeof(settings));
+  settings.on_message_begin = on_message_begin;
+  settings.on_url = on_url;
+  settings.on_header_field = on_header_field;
+  settings.on_header_value = on_header_value;
+  settings.on_headers_complete = on_headers_complete;
+  settings.on_body = on_body;
+  settings.on_message_complete = on_message_complete;
+
+  http_parser parser;
+  http_parser_init(&parser, file_type);
+  size_t nparsed = http_parser_execute(&parser, &settings, data, file_length);
+  free(data);
+
+  if (nparsed != (size_t)file_length) {
+    fprintf(stderr,
+            "Error: %s (%s)\n",
+            http_errno_description(HTTP_PARSER_ERRNO(&parser)),
+            http_errno_name(HTTP_PARSER_ERRNO(&parser)));
+    goto fail;
+  }
+
+  return EXIT_SUCCESS;
+
+fail:
+  fclose(file);
+  return EXIT_FAILURE;
+}
diff --git a/external/qhttpserver/http-parser/contrib/url_parser.c b/external/qhttpserver/http-parser/contrib/url_parser.c
new file mode 100644
index 0000000..6650b41
--- /dev/null
+++ b/external/qhttpserver/http-parser/contrib/url_parser.c
@@ -0,0 +1,46 @@
+#include "http_parser.h"
+#include <stdio.h>
+#include <string.h>
+
+void
+dump_url (const char *url, const struct http_parser_url *u)
+{
+  unsigned int i;
+
+  printf("\tfield_set: 0x%x, port: %u\n", u->field_set, u->port);
+  for (i = 0; i < UF_MAX; i++) {
+    if ((u->field_set & (1 << i)) == 0) {
+      printf("\tfield_data[%u]: unset\n", i);
+      continue;
+    }
+
+    printf("\tfield_data[%u]: off: %u, len: %u, part: %.*s\n",
+           i,
+           u->field_data[i].off,
+           u->field_data[i].len,
+           u->field_data[i].len,
+           url + u->field_data[i].off);
+  }
+}
+
+int main(int argc, char ** argv) {
+  struct http_parser_url u;
+  int len, connect, result;
+
+  if (argc != 3) {
+    printf("Syntax : %s connect|get url\n", argv[0]);
+    return 1;
+  }
+  len = strlen(argv[2]);
+  connect = strcmp("connect", argv[1]) == 0 ? 1 : 0;
+  printf("Parsing %s, connect %d\n", argv[2], connect);
+
+  result = http_parser_parse_url(argv[2], len, connect, &u);
+  if (result != 0) {
+    printf("Parse error : %d\n", result);
+    return result;
+  }
+  printf("Parse ok, result : \n");
+  dump_url(argv[2], &u);
+  return 0;
+}
\ No newline at end of file
diff --git a/external/qhttpserver/http-parser/http_parser.c b/external/qhttpserver/http-parser/http_parser.c
new file mode 100755
index 0000000..0fa1c36
--- /dev/null
+++ b/external/qhttpserver/http-parser/http_parser.c
@@ -0,0 +1,2429 @@
+/* Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev
+ *
+ * Additional changes are licensed under the same terms as NGINX and
+ * copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#include "http_parser.h"
+#include <assert.h>
+#include <stddef.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#ifndef ULLONG_MAX
+# define ULLONG_MAX ((uint64_t) -1) /* 2^64-1 */
+#endif
+
+#ifndef MIN
+# define MIN(a,b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef ARRAY_SIZE
+# define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#endif
+
+#ifndef BIT_AT
+# define BIT_AT(a, i)                                                \
+  (!!((unsigned int) (a)[(unsigned int) (i) >> 3] &                  \
+   (1 << ((unsigned int) (i) & 7))))
+#endif
+
+#ifndef ELEM_AT
+# define ELEM_AT(a, i, v) ((unsigned int) (i) < ARRAY_SIZE(a) ? (a)[(i)] : (v))
+#endif
+
+#define SET_ERRNO(e)                                                 \
+do {                                                                 \
+  parser->http_errno = (e);                                          \
+} while(0)
+
+#define CURRENT_STATE() p_state
+#define UPDATE_STATE(V) p_state = (enum state) (V);
+#define RETURN(V)                                                    \
+do {                                                                 \
+  parser->state = CURRENT_STATE();                                   \
+  return (V);                                                        \
+} while (0);
+#define REEXECUTE()                                                  \
+  goto reexecute;                                                    \
+
+
+#ifdef __GNUC__
+# define LIKELY(X) __builtin_expect(!!(X), 1)
+# define UNLIKELY(X) __builtin_expect(!!(X), 0)
+#else
+# define LIKELY(X) (X)
+# define UNLIKELY(X) (X)
+#endif
+
+
+/* Run the notify callback FOR, returning ER if it fails */
+#define CALLBACK_NOTIFY_(FOR, ER)                                    \
+do {                                                                 \
+  assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);                       \
+                                                                     \
+  if (LIKELY(settings->on_##FOR)) {                                  \
+    parser->state = CURRENT_STATE();                                 \
+    if (UNLIKELY(0 != settings->on_##FOR(parser))) {                 \
+      SET_ERRNO(HPE_CB_##FOR);                                       \
+    }                                                                \
+    UPDATE_STATE(parser->state);                                     \
+                                                                     \
+    /* We either errored above or got paused; get out */             \
+    if (UNLIKELY(HTTP_PARSER_ERRNO(parser) != HPE_OK)) {             \
+      return (ER);                                                   \
+    }                                                                \
+  }                                                                  \
+} while (0)
+
+/* Run the notify callback FOR and consume the current byte */
+#define CALLBACK_NOTIFY(FOR)            CALLBACK_NOTIFY_(FOR, p - data + 1)
+
+/* Run the notify callback FOR and don't consume the current byte */
+#define CALLBACK_NOTIFY_NOADVANCE(FOR)  CALLBACK_NOTIFY_(FOR, p - data)
+
+/* Run data callback FOR with LEN bytes, returning ER if it fails */
+#define CALLBACK_DATA_(FOR, LEN, ER)                                 \
+do {                                                                 \
+  assert(HTTP_PARSER_ERRNO(parser) == HPE_OK);                       \
+                                                                     \
+  if (FOR##_mark) {                                                  \
+    if (LIKELY(settings->on_##FOR)) {                                \
+      parser->state = CURRENT_STATE();                               \
+      if (UNLIKELY(0 !=                                              \
+                   settings->on_##FOR(parser, FOR##_mark, (LEN)))) { \
+        SET_ERRNO(HPE_CB_##FOR);                                     \
+      }                                                              \
+      UPDATE_STATE(parser->state);                                   \
+                                                                     \
+      /* We either errored above or got paused; get out */           \
+      if (UNLIKELY(HTTP_PARSER_ERRNO(parser) != HPE_OK)) {           \
+        return (ER);                                                 \
+      }                                                              \
+    }                                                                \
+    FOR##_mark = NULL;                                               \
+  }                                                                  \
+} while (0)
+  
+/* Run the data callback FOR and consume the current byte */
+#define CALLBACK_DATA(FOR)                                           \
+    CALLBACK_DATA_(FOR, p - FOR##_mark, p - data + 1)
+
+/* Run the data callback FOR and don't consume the current byte */
+#define CALLBACK_DATA_NOADVANCE(FOR)                                 \
+    CALLBACK_DATA_(FOR, p - FOR##_mark, p - data)
+
+/* Set the mark FOR; non-destructive if mark is already set */
+#define MARK(FOR)                                                    \
+do {                                                                 \
+  if (!FOR##_mark) {                                                 \
+    FOR##_mark = p;                                                  \
+  }                                                                  \
+} while (0)
+
+/* Don't allow the total size of the HTTP headers (including the status
+ * line) to exceed HTTP_MAX_HEADER_SIZE.  This check is here to protect
+ * embedders against denial-of-service attacks where the attacker feeds
+ * us a never-ending header that the embedder keeps buffering.
+ *
+ * This check is arguably the responsibility of embedders but we're doing
+ * it on the embedder's behalf because most won't bother and this way we
+ * make the web a little safer.  HTTP_MAX_HEADER_SIZE is still far bigger
+ * than any reasonable request or response so this should never affect
+ * day-to-day operation.
+ */
+#define COUNT_HEADER_SIZE(V)                                         \
+do {                                                                 \
+  parser->nread += (V);                                              \
+  if (UNLIKELY(parser->nread > (HTTP_MAX_HEADER_SIZE))) {            \
+    SET_ERRNO(HPE_HEADER_OVERFLOW);                                  \
+    goto error;                                                      \
+  }                                                                  \
+} while (0)
+
+
+#define PROXY_CONNECTION "proxy-connection"
+#define CONNECTION "connection"
+#define CONTENT_LENGTH "content-length"
+#define TRANSFER_ENCODING "transfer-encoding"
+#define UPGRADE "upgrade"
+#define CHUNKED "chunked"
+#define KEEP_ALIVE "keep-alive"
+#define CLOSE "close"
+
+
+static const char *method_strings[] =
+  {
+#define XX(num, name, string) #string,
+  HTTP_METHOD_MAP(XX)
+#undef XX
+  };
+
+
+/* Tokens as defined by rfc 2616. Also lowercases them.
+ *        token       = 1*<any CHAR except CTLs or separators>
+ *     separators     = "(" | ")" | "<" | ">" | "@"
+ *                    | "," | ";" | ":" | "\" | <">
+ *                    | "/" | "[" | "]" | "?" | "="
+ *                    | "{" | "}" | SP | HT
+ */
+static const char tokens[256] = {
+/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+        0,       0,       0,       0,       0,       0,       0,       0,
+/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+        0,      '!',      0,      '#',     '$',     '%',     '&',    '\'',
+/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+        0,       0,      '*',     '+',      0,      '-',     '.',      0,
+/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+       '0',     '1',     '2',     '3',     '4',     '5',     '6',     '7',
+/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+       '8',     '9',      0,       0,       0,       0,       0,       0,
+/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+        0,      'a',     'b',     'c',     'd',     'e',     'f',     'g',
+/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
+/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
+       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
+/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+       'x',     'y',     'z',      0,       0,       0,      '^',     '_',
+/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+       '`',     'a',     'b',     'c',     'd',     'e',     'f',     'g',
+/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+       'h',     'i',     'j',     'k',     'l',     'm',     'n',     'o',
+/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+       'p',     'q',     'r',     's',     't',     'u',     'v',     'w',
+/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+       'x',     'y',     'z',      0,      '|',      0,      '~',       0 };
+
+
+static const int8_t unhex[256] =
+  {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  , 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,-1,-1,-1,-1,-1,-1
+  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,10,11,12,13,14,15,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  ,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1
+  };
+
+
+#if HTTP_PARSER_STRICT
+# define T(v) 0
+#else
+# define T(v) v
+#endif
+
+
+static const uint8_t normal_url_char[32] = {
+/*   0 nul    1 soh    2 stx    3 etx    4 eot    5 enq    6 ack    7 bel  */
+        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+/*   8 bs     9 ht    10 nl    11 vt    12 np    13 cr    14 so    15 si   */
+        0    | T(2)   |   0    |   0    | T(16)  |   0    |   0    |   0,
+/*  16 dle   17 dc1   18 dc2   19 dc3   20 dc4   21 nak   22 syn   23 etb */
+        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+/*  24 can   25 em    26 sub   27 esc   28 fs    29 gs    30 rs    31 us  */
+        0    |   0    |   0    |   0    |   0    |   0    |   0    |   0,
+/*  32 sp    33  !    34  "    35  #    36  $    37  %    38  &    39  '  */
+        0    |   2    |   4    |   0    |   16   |   32   |   64   |  128,
+/*  40  (    41  )    42  *    43  +    44  ,    45  -    46  .    47  /  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  48  0    49  1    50  2    51  3    52  4    53  5    54  6    55  7  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  56  8    57  9    58  :    59  ;    60  <    61  =    62  >    63  ?  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0,
+/*  64  @    65  A    66  B    67  C    68  D    69  E    70  F    71  G  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  72  H    73  I    74  J    75  K    76  L    77  M    78  N    79  O  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  80  P    81  Q    82  R    83  S    84  T    85  U    86  V    87  W  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  88  X    89  Y    90  Z    91  [    92  \    93  ]    94  ^    95  _  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/*  96  `    97  a    98  b    99  c   100  d   101  e   102  f   103  g  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/* 104  h   105  i   106  j   107  k   108  l   109  m   110  n   111  o  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/* 112  p   113  q   114  r   115  s   116  t   117  u   118  v   119  w  */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |  128,
+/* 120  x   121  y   122  z   123  {   124  |   125  }   126  ~   127 del */
+        1    |   2    |   4    |   8    |   16   |   32   |   64   |   0, };
+
+#undef T
+
+enum state
+  { s_dead = 1 /* important that this is > 0 */
+
+  , s_start_req_or_res
+  , s_res_or_resp_H
+  , s_start_res
+  , s_res_H
+  , s_res_HT
+  , s_res_HTT
+  , s_res_HTTP
+  , s_res_first_http_major
+  , s_res_http_major
+  , s_res_first_http_minor
+  , s_res_http_minor
+  , s_res_first_status_code
+  , s_res_status_code
+  , s_res_status_start
+  , s_res_status
+  , s_res_line_almost_done
+
+  , s_start_req
+
+  , s_req_method
+  , s_req_spaces_before_url
+  , s_req_schema
+  , s_req_schema_slash
+  , s_req_schema_slash_slash
+  , s_req_server_start
+  , s_req_server
+  , s_req_server_with_at
+  , s_req_path
+  , s_req_query_string_start
+  , s_req_query_string
+  , s_req_fragment_start
+  , s_req_fragment
+  , s_req_http_start
+  , s_req_http_H
+  , s_req_http_HT
+  , s_req_http_HTT
+  , s_req_http_HTTP
+  , s_req_first_http_major
+  , s_req_http_major
+  , s_req_first_http_minor
+  , s_req_http_minor
+  , s_req_line_almost_done
+
+  , s_header_field_start
+  , s_header_field
+  , s_header_value_discard_ws
+  , s_header_value_discard_ws_almost_done
+  , s_header_value_discard_lws
+  , s_header_value_start
+  , s_header_value
+  , s_header_value_lws
+
+  , s_header_almost_done
+
+  , s_chunk_size_start
+  , s_chunk_size
+  , s_chunk_parameters
+  , s_chunk_size_almost_done
+
+  , s_headers_almost_done
+  , s_headers_done
+
+  /* Important: 's_headers_done' must be the last 'header' state. All
+   * states beyond this must be 'body' states. It is used for overflow
+   * checking. See the PARSING_HEADER() macro.
+   */
+
+  , s_chunk_data
+  , s_chunk_data_almost_done
+  , s_chunk_data_done
+
+  , s_body_identity
+  , s_body_identity_eof
+
+  , s_message_done
+  };
+
+
+#define PARSING_HEADER(state) (state <= s_headers_done)
+
+
+enum header_states
+  { h_general = 0
+  , h_C
+  , h_CO
+  , h_CON
+
+  , h_matching_connection
+  , h_matching_proxy_connection
+  , h_matching_content_length
+  , h_matching_transfer_encoding
+  , h_matching_upgrade
+
+  , h_connection
+  , h_content_length
+  , h_transfer_encoding
+  , h_upgrade
+
+  , h_matching_transfer_encoding_chunked
+  , h_matching_connection_token_start
+  , h_matching_connection_keep_alive
+  , h_matching_connection_close
+  , h_matching_connection_upgrade
+  , h_matching_connection_token
+
+  , h_transfer_encoding_chunked
+  , h_connection_keep_alive
+  , h_connection_close
+  , h_connection_upgrade
+  };
+
+enum http_host_state
+  {
+    s_http_host_dead = 1
+  , s_http_userinfo_start
+  , s_http_userinfo
+  , s_http_host_start
+  , s_http_host_v6_start
+  , s_http_host
+  , s_http_host_v6
+  , s_http_host_v6_end
+  , s_http_host_port_start
+  , s_http_host_port
+};
+
+/* Macros for character classes; depends on strict-mode  */
+#define CR                  '\r'
+#define LF                  '\n'
+#define LOWER(c)            (unsigned char)(c | 0x20)
+#define IS_ALPHA(c)         (LOWER(c) >= 'a' && LOWER(c) <= 'z')
+#define IS_NUM(c)           ((c) >= '0' && (c) <= '9')
+#define IS_ALPHANUM(c)      (IS_ALPHA(c) || IS_NUM(c))
+#define IS_HEX(c)           (IS_NUM(c) || (LOWER(c) >= 'a' && LOWER(c) <= 'f'))
+#define IS_MARK(c)          ((c) == '-' || (c) == '_' || (c) == '.' || \
+  (c) == '!' || (c) == '~' || (c) == '*' || (c) == '\'' || (c) == '(' || \
+  (c) == ')')
+#define IS_USERINFO_CHAR(c) (IS_ALPHANUM(c) || IS_MARK(c) || (c) == '%' || \
+  (c) == ';' || (c) == ':' || (c) == '&' || (c) == '=' || (c) == '+' || \
+  (c) == '$' || (c) == ',')
+
+#define STRICT_TOKEN(c)     (tokens[(unsigned char)c])
+
+#if HTTP_PARSER_STRICT
+#define TOKEN(c)            (tokens[(unsigned char)c])
+#define IS_URL_CHAR(c)      (BIT_AT(normal_url_char, (unsigned char)c))
+#define IS_HOST_CHAR(c)     (IS_ALPHANUM(c) || (c) == '.' || (c) == '-')
+#else
+#define TOKEN(c)            ((c == ' ') ? ' ' : tokens[(unsigned char)c])
+#define IS_URL_CHAR(c)                                                         \
+  (BIT_AT(normal_url_char, (unsigned char)c) || ((c) & 0x80))
+#define IS_HOST_CHAR(c)                                                        \
+  (IS_ALPHANUM(c) || (c) == '.' || (c) == '-' || (c) == '_')
+#endif
+
+
+#define start_state (parser->type == HTTP_REQUEST ? s_start_req : s_start_res)
+
+
+#if HTTP_PARSER_STRICT
+# define STRICT_CHECK(cond)                                          \
+do {                                                                 \
+  if (cond) {                                                        \
+    SET_ERRNO(HPE_STRICT);                                           \
+    goto error;                                                      \
+  }                                                                  \
+} while (0)
+# define NEW_MESSAGE() (http_should_keep_alive(parser) ? start_state : s_dead)
+#else
+# define STRICT_CHECK(cond)
+# define NEW_MESSAGE() start_state
+#endif
+
+
+/* Map errno values to strings for human-readable output */
+#define HTTP_STRERROR_GEN(n, s) { "HPE_" #n, s },
+static struct {
+  const char *name;
+  const char *description;
+} http_strerror_tab[] = {
+  HTTP_ERRNO_MAP(HTTP_STRERROR_GEN)
+};
+#undef HTTP_STRERROR_GEN
+
+int http_message_needs_eof(const http_parser *parser);
+
+/* Our URL parser.
+ *
+ * This is designed to be shared by http_parser_execute() for URL validation,
+ * hence it has a state transition + byte-for-byte interface. In addition, it
+ * is meant to be embedded in http_parser_parse_url(), which does the dirty
+ * work of turning state transitions URL components for its API.
+ *
+ * This function should only be invoked with non-space characters. It is
+ * assumed that the caller cares about (and can detect) the transition between
+ * URL and non-URL states by looking for these.
+ */
+static enum state
+parse_url_char(enum state s, const char ch)
+{
+  if (ch == ' ' || ch == '\r' || ch == '\n') {
+    return s_dead;
+  }
+
+#if HTTP_PARSER_STRICT
+  if (ch == '\t' || ch == '\f') {
+    return s_dead;
+  }
+#endif
+
+  switch (s) {
+    case s_req_spaces_before_url:
+      /* Proxied requests are followed by scheme of an absolute URI (alpha).
+       * All methods except CONNECT are followed by '/' or '*'.
+       */
+
+      if (ch == '/' || ch == '*') {
+        return s_req_path;
+      }
+
+      if (IS_ALPHA(ch)) {
+        return s_req_schema;
+      }
+
+      break;
+
+    case s_req_schema:
+      if (IS_ALPHA(ch)) {
+        return s;
+      }
+
+      if (ch == ':') {
+        return s_req_schema_slash;
+      }
+
+      break;
+
+    case s_req_schema_slash:
+      if (ch == '/') {
+        return s_req_schema_slash_slash;
+      }
+
+      break;
+
+    case s_req_schema_slash_slash:
+      if (ch == '/') {
+        return s_req_server_start;
+      }
+
+      break;
+
+    case s_req_server_with_at:
+      if (ch == '@') {
+        return s_dead;
+      }
+
+    /* FALLTHROUGH */
+    case s_req_server_start:
+    case s_req_server:
+      if (ch == '/') {
+        return s_req_path;
+      }
+
+      if (ch == '?') {
+        return s_req_query_string_start;
+      }
+
+      if (ch == '@') {
+        return s_req_server_with_at;
+      }
+
+      if (IS_USERINFO_CHAR(ch) || ch == '[' || ch == ']') {
+        return s_req_server;
+      }
+
+      break;
+
+    case s_req_path:
+      if (IS_URL_CHAR(ch)) {
+        return s;
+      }
+
+      switch (ch) {
+        case '?':
+          return s_req_query_string_start;
+
+        case '#':
+          return s_req_fragment_start;
+      }
+
+      break;
+
+    case s_req_query_string_start:
+    case s_req_query_string:
+      if (IS_URL_CHAR(ch)) {
+        return s_req_query_string;
+      }
+
+      switch (ch) {
+        case '?':
+          /* allow extra '?' in query string */
+          return s_req_query_string;
+
+        case '#':
+          return s_req_fragment_start;
+      }
+
+      break;
+
+    case s_req_fragment_start:
+      if (IS_URL_CHAR(ch)) {
+        return s_req_fragment;
+      }
+
+      switch (ch) {
+        case '?':
+          return s_req_fragment;
+
+        case '#':
+          return s;
+      }
+
+      break;
+
+    case s_req_fragment:
+      if (IS_URL_CHAR(ch)) {
+        return s;
+      }
+
+      switch (ch) {
+        case '?':
+        case '#':
+          return s;
+      }
+
+      break;
+
+    default:
+      break;
+  }
+
+  /* We should never fall out of the switch above unless there's an error */
+  return s_dead;
+}
+
+size_t http_parser_execute (http_parser *parser,
+                            const http_parser_settings *settings,
+                            const char *data,
+                            size_t len)
+{
+  char c, ch;
+  int8_t unhex_val;
+  const char *p = data;
+  const char *header_field_mark = 0;
+  const char *header_value_mark = 0;
+  const char *url_mark = 0;
+  const char *body_mark = 0;
+  const char *status_mark = 0;
+  enum state p_state = (enum state) parser->state;
+
+  /* We're in an error state. Don't bother doing anything. */
+  if (HTTP_PARSER_ERRNO(parser) != HPE_OK) {
+    return 0;
+  }
+
+  if (len == 0) {
+    switch (CURRENT_STATE()) {
+      case s_body_identity_eof:
+        /* Use of CALLBACK_NOTIFY() here would erroneously return 1 byte read if
+         * we got paused.
+         */
+        CALLBACK_NOTIFY_NOADVANCE(message_complete);
+        return 0;
+
+      case s_dead:
+      case s_start_req_or_res:
+      case s_start_res:
+      case s_start_req:
+        return 0;
+
+      default:
+        SET_ERRNO(HPE_INVALID_EOF_STATE);
+        return 1;
+    }
+  }
+
+
+  if (CURRENT_STATE() == s_header_field)
+    header_field_mark = data;
+  if (CURRENT_STATE() == s_header_value)
+    header_value_mark = data;
+  switch (CURRENT_STATE()) {
+  case s_req_path:
+  case s_req_schema:
+  case s_req_schema_slash:
+  case s_req_schema_slash_slash:
+  case s_req_server_start:
+  case s_req_server:
+  case s_req_server_with_at:
+  case s_req_query_string_start:
+  case s_req_query_string:
+  case s_req_fragment_start:
+  case s_req_fragment:
+    url_mark = data;
+    break;
+  case s_res_status:
+    status_mark = data;
+    break;
+  default:
+    break;
+  }
+
+  for (p=data; p != data + len; p++) {
+    ch = *p;
+
+    if (PARSING_HEADER(CURRENT_STATE()))
+      COUNT_HEADER_SIZE(1);
+
+reexecute:
+    switch (CURRENT_STATE()) {
+
+      case s_dead:
+        /* this state is used after a 'Connection: close' message
+         * the parser will error out if it reads another message
+         */
+        if (LIKELY(ch == CR || ch == LF))
+          break;
+
+        SET_ERRNO(HPE_CLOSED_CONNECTION);
+        goto error;
+
+      case s_start_req_or_res:
+      {
+        if (ch == CR || ch == LF)
+          break;
+        parser->flags = 0;
+        parser->content_length = ULLONG_MAX;
+
+        if (ch == 'H') {
+          UPDATE_STATE(s_res_or_resp_H);
+
+          CALLBACK_NOTIFY(message_begin);
+        } else {
+          parser->type = HTTP_REQUEST;
+          UPDATE_STATE(s_start_req);
+          REEXECUTE();
+        }
+
+        break;
+      }
+
+      case s_res_or_resp_H:
+        if (ch == 'T') {
+          parser->type = HTTP_RESPONSE;
+          UPDATE_STATE(s_res_HT);
+        } else {
+          if (UNLIKELY(ch != 'E')) {
+            SET_ERRNO(HPE_INVALID_CONSTANT);
+            goto error;
+          }
+
+          parser->type = HTTP_REQUEST;
+          parser->method = HTTP_HEAD;
+          parser->index = 2;
+          UPDATE_STATE(s_req_method);
+        }
+        break;
+
+      case s_start_res:
+      {
+        parser->flags = 0;
+        parser->content_length = ULLONG_MAX;
+
+        switch (ch) {
+          case 'H':
+            UPDATE_STATE(s_res_H);
+            break;
+
+          case CR:
+          case LF:
+            break;
+
+          default:
+            SET_ERRNO(HPE_INVALID_CONSTANT);
+            goto error;
+        }
+
+        CALLBACK_NOTIFY(message_begin);
+        break;
+      }
+
+      case s_res_H:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_res_HT);
+        break;
+
+      case s_res_HT:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_res_HTT);
+        break;
+
+      case s_res_HTT:
+        STRICT_CHECK(ch != 'P');
+        UPDATE_STATE(s_res_HTTP);
+        break;
+
+      case s_res_HTTP:
+        STRICT_CHECK(ch != '/');
+        UPDATE_STATE(s_res_first_http_major);
+        break;
+
+      case s_res_first_http_major:
+        if (UNLIKELY(ch < '0' || ch > '9')) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_major = ch - '0';
+        UPDATE_STATE(s_res_http_major);
+        break;
+
+      /* major HTTP version or dot */
+      case s_res_http_major:
+      {
+        if (ch == '.') {
+          UPDATE_STATE(s_res_first_http_minor);
+          break;
+        }
+
+        if (!IS_NUM(ch)) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_major *= 10;
+        parser->http_major += ch - '0';
+
+        if (UNLIKELY(parser->http_major > 999)) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        break;
+      }
+
+      /* first digit of minor HTTP version */
+      case s_res_first_http_minor:
+        if (UNLIKELY(!IS_NUM(ch))) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_minor = ch - '0';
+        UPDATE_STATE(s_res_http_minor);
+        break;
+
+      /* minor HTTP version or end of request line */
+      case s_res_http_minor:
+      {
+        if (ch == ' ') {
+          UPDATE_STATE(s_res_first_status_code);
+          break;
+        }
+
+        if (UNLIKELY(!IS_NUM(ch))) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_minor *= 10;
+        parser->http_minor += ch - '0';
+
+        if (UNLIKELY(parser->http_minor > 999)) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        break;
+      }
+
+      case s_res_first_status_code:
+      {
+        if (!IS_NUM(ch)) {
+          if (ch == ' ') {
+            break;
+          }
+
+          SET_ERRNO(HPE_INVALID_STATUS);
+          goto error;
+        }
+        parser->status_code = ch - '0';
+        UPDATE_STATE(s_res_status_code);
+        break;
+      }
+
+      case s_res_status_code:
+      {
+        if (!IS_NUM(ch)) {
+          switch (ch) {
+            case ' ':
+              UPDATE_STATE(s_res_status_start);
+              break;
+            case CR:
+              UPDATE_STATE(s_res_line_almost_done);
+              break;
+            case LF:
+              UPDATE_STATE(s_header_field_start);
+              break;
+            default:
+              SET_ERRNO(HPE_INVALID_STATUS);
+              goto error;
+          }
+          break;
+        }
+
+        parser->status_code *= 10;
+        parser->status_code += ch - '0';
+
+        if (UNLIKELY(parser->status_code > 999)) {
+          SET_ERRNO(HPE_INVALID_STATUS);
+          goto error;
+        }
+
+        break;
+      }
+
+      case s_res_status_start:
+      {
+        if (ch == CR) {
+          UPDATE_STATE(s_res_line_almost_done);
+          break;
+        }
+
+        if (ch == LF) {
+          UPDATE_STATE(s_header_field_start);
+          break;
+        }
+
+        MARK(status);
+        UPDATE_STATE(s_res_status);
+        parser->index = 0;
+        break;
+      }
+
+      case s_res_status:
+        if (ch == CR) {
+          UPDATE_STATE(s_res_line_almost_done);
+          CALLBACK_DATA(status);
+          break;
+        }
+
+        if (ch == LF) {
+          UPDATE_STATE(s_header_field_start);
+          CALLBACK_DATA(status);
+          break;
+        }
+
+        break;
+
+      case s_res_line_almost_done:
+        STRICT_CHECK(ch != LF);
+        UPDATE_STATE(s_header_field_start);
+        break;
+
+      case s_start_req:
+      {
+        if (ch == CR || ch == LF)
+          break;
+        parser->flags = 0;
+        parser->content_length = ULLONG_MAX;
+
+        if (UNLIKELY(!IS_ALPHA(ch))) {
+          SET_ERRNO(HPE_INVALID_METHOD);
+          goto error;
+        }
+
+        parser->method = (enum http_method) 0;
+        parser->index = 1;
+        switch (ch) {
+          case 'C': parser->method = HTTP_CONNECT; /* or COPY, CHECKOUT */ break;
+          case 'D': parser->method = HTTP_DELETE; break;
+          case 'G': parser->method = HTTP_GET; break;
+          case 'H': parser->method = HTTP_HEAD; break;
+          case 'L': parser->method = HTTP_LOCK; break;
+          case 'M': parser->method = HTTP_MKCOL; /* or MOVE, MKACTIVITY, MERGE, M-SEARCH, MKCALENDAR */ break;
+          case 'N': parser->method = HTTP_NOTIFY; break;
+          case 'O': parser->method = HTTP_OPTIONS; break;
+          case 'P': parser->method = HTTP_POST;
+            /* or PROPFIND|PROPPATCH|PUT|PATCH|PURGE */
+            break;
+          case 'R': parser->method = HTTP_REPORT; break;
+          case 'S': parser->method = HTTP_SUBSCRIBE; /* or SEARCH */ break;
+          case 'T': parser->method = HTTP_TRACE; break;
+          case 'U': parser->method = HTTP_UNLOCK; /* or UNSUBSCRIBE */ break;
+          default:
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+        }
+        UPDATE_STATE(s_req_method);
+
+        CALLBACK_NOTIFY(message_begin);
+
+        break;
+      }
+
+      case s_req_method:
+      {
+        const char *matcher;
+        if (UNLIKELY(ch == '\0')) {
+          SET_ERRNO(HPE_INVALID_METHOD);
+          goto error;
+        }
+
+        matcher = method_strings[parser->method];
+        if (ch == ' ' && matcher[parser->index] == '\0') {
+          UPDATE_STATE(s_req_spaces_before_url);
+        } else if (ch == matcher[parser->index]) {
+          ; /* nada */
+        } else if (parser->method == HTTP_CONNECT) {
+          if (parser->index == 1 && ch == 'H') {
+            parser->method = HTTP_CHECKOUT;
+          } else if (parser->index == 2  && ch == 'P') {
+            parser->method = HTTP_COPY;
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->method == HTTP_MKCOL) {
+          if (parser->index == 1 && ch == 'O') {
+            parser->method = HTTP_MOVE;
+          } else if (parser->index == 1 && ch == 'E') {
+            parser->method = HTTP_MERGE;
+          } else if (parser->index == 1 && ch == '-') {
+            parser->method = HTTP_MSEARCH;
+          } else if (parser->index == 2 && ch == 'A') {
+            parser->method = HTTP_MKACTIVITY;
+          } else if (parser->index == 3 && ch == 'A') {
+            parser->method = HTTP_MKCALENDAR;
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->method == HTTP_SUBSCRIBE) {
+          if (parser->index == 1 && ch == 'E') {
+            parser->method = HTTP_SEARCH;
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->index == 1 && parser->method == HTTP_POST) {
+          if (ch == 'R') {
+            parser->method = HTTP_PROPFIND; /* or HTTP_PROPPATCH */
+          } else if (ch == 'U') {
+            parser->method = HTTP_PUT; /* or HTTP_PURGE */
+          } else if (ch == 'A') {
+            parser->method = HTTP_PATCH;
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->index == 2) {
+          if (parser->method == HTTP_PUT) {
+            if (ch == 'R') {
+              parser->method = HTTP_PURGE;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+          } else if (parser->method == HTTP_UNLOCK) {
+            if (ch == 'S') {
+              parser->method = HTTP_UNSUBSCRIBE;
+            } else {
+              SET_ERRNO(HPE_INVALID_METHOD);
+              goto error;
+            }
+          } else {
+            SET_ERRNO(HPE_INVALID_METHOD);
+            goto error;
+          }
+        } else if (parser->index == 4 && parser->method == HTTP_PROPFIND && ch == 'P') {
+          parser->method = HTTP_PROPPATCH;
+        } else {
+          SET_ERRNO(HPE_INVALID_METHOD);
+          goto error;
+        }
+
+        ++parser->index;
+        break;
+      }
+
+      case s_req_spaces_before_url:
+      {
+        if (ch == ' ') break;
+
+        MARK(url);
+        if (parser->method == HTTP_CONNECT) {
+          UPDATE_STATE(s_req_server_start);
+        }
+
+        UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
+        if (UNLIKELY(CURRENT_STATE() == s_dead)) {
+          SET_ERRNO(HPE_INVALID_URL);
+          goto error;
+        }
+
+        break;
+      }
+
+      case s_req_schema:
+      case s_req_schema_slash:
+      case s_req_schema_slash_slash:
+      case s_req_server_start:
+      {
+        switch (ch) {
+          /* No whitespace allowed here */
+          case ' ':
+          case CR:
+          case LF:
+            SET_ERRNO(HPE_INVALID_URL);
+            goto error;
+          default:
+            UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
+            if (UNLIKELY(CURRENT_STATE() == s_dead)) {
+              SET_ERRNO(HPE_INVALID_URL);
+              goto error;
+            }
+        }
+
+        break;
+      }
+
+      case s_req_server:
+      case s_req_server_with_at:
+      case s_req_path:
+      case s_req_query_string_start:
+      case s_req_query_string:
+      case s_req_fragment_start:
+      case s_req_fragment:
+      {
+        switch (ch) {
+          case ' ':
+            UPDATE_STATE(s_req_http_start);
+            CALLBACK_DATA(url);
+            break;
+          case CR:
+          case LF:
+            parser->http_major = 0;
+            parser->http_minor = 9;
+            UPDATE_STATE((ch == CR) ?
+              s_req_line_almost_done :
+              s_header_field_start);
+            CALLBACK_DATA(url);
+            break;
+          default:
+            UPDATE_STATE(parse_url_char(CURRENT_STATE(), ch));
+            if (UNLIKELY(CURRENT_STATE() == s_dead)) {
+              SET_ERRNO(HPE_INVALID_URL);
+              goto error;
+            }
+        }
+        break;
+      }
+
+      case s_req_http_start:
+        switch (ch) {
+          case 'H':
+            UPDATE_STATE(s_req_http_H);
+            break;
+          case ' ':
+            break;
+          default:
+            SET_ERRNO(HPE_INVALID_CONSTANT);
+            goto error;
+        }
+        break;
+
+      case s_req_http_H:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_req_http_HT);
+        break;
+
+      case s_req_http_HT:
+        STRICT_CHECK(ch != 'T');
+        UPDATE_STATE(s_req_http_HTT);
+        break;
+
+      case s_req_http_HTT:
+        STRICT_CHECK(ch != 'P');
+        UPDATE_STATE(s_req_http_HTTP);
+        break;
+
+      case s_req_http_HTTP:
+        STRICT_CHECK(ch != '/');
+        UPDATE_STATE(s_req_first_http_major);
+        break;
+
+      /* first digit of major HTTP version */
+      case s_req_first_http_major:
+        if (UNLIKELY(ch < '1' || ch > '9')) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_major = ch - '0';
+        UPDATE_STATE(s_req_http_major);
+        break;
+
+      /* major HTTP version or dot */
+      case s_req_http_major:
+      {
+        if (ch == '.') {
+          UPDATE_STATE(s_req_first_http_minor);
+          break;
+        }
+
+        if (UNLIKELY(!IS_NUM(ch))) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_major *= 10;
+        parser->http_major += ch - '0';
+
+        if (UNLIKELY(parser->http_major > 999)) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        break;
+      }
+
+      /* first digit of minor HTTP version */
+      case s_req_first_http_minor:
+        if (UNLIKELY(!IS_NUM(ch))) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_minor = ch - '0';
+        UPDATE_STATE(s_req_http_minor);
+        break;
+
+      /* minor HTTP version or end of request line */
+      case s_req_http_minor:
+      {
+        if (ch == CR) {
+          UPDATE_STATE(s_req_line_almost_done);
+          break;
+        }
+
+        if (ch == LF) {
+          UPDATE_STATE(s_header_field_start);
+          break;
+        }
+
+        /* XXX allow spaces after digit? */
+
+        if (UNLIKELY(!IS_NUM(ch))) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        parser->http_minor *= 10;
+        parser->http_minor += ch - '0';
+
+        if (UNLIKELY(parser->http_minor > 999)) {
+          SET_ERRNO(HPE_INVALID_VERSION);
+          goto error;
+        }
+
+        break;
+      }
+
+      /* end of request line */
+      case s_req_line_almost_done:
+      {
+        if (UNLIKELY(ch != LF)) {
+          SET_ERRNO(HPE_LF_EXPECTED);
+          goto error;
+        }
+
+        UPDATE_STATE(s_header_field_start);
+        break;
+      }
+
+      case s_header_field_start:
+      {
+        if (ch == CR) {
+          UPDATE_STATE(s_headers_almost_done);
+          break;
+        }
+
+        if (ch == LF) {
+          /* they might be just sending \n instead of \r\n so this would be
+           * the second \n to denote the end of headers*/
+          UPDATE_STATE(s_headers_almost_done);
+          REEXECUTE();
+        }
+
+        c = TOKEN(ch);
+
+        if (UNLIKELY(!c)) {
+          SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
+          goto error;
+        }
+
+        MARK(header_field);
+
+        parser->index = 0;
+        UPDATE_STATE(s_header_field);
+
+        switch (c) {
+          case 'c':
+            parser->header_state = h_C;
+            break;
+
+          case 'p':
+            parser->header_state = h_matching_proxy_connection;
+            break;
+
+          case 't':
+            parser->header_state = h_matching_transfer_encoding;
+            break;
+
+          case 'u':
+            parser->header_state = h_matching_upgrade;
+            break;
+
+          default:
+            parser->header_state = h_general;
+            break;
+        }
+        break;
+      }
+
+      case s_header_field:
+      {
+        const char* start = p;
+        for (; p != data + len; p++) {
+          ch = *p;
+          c = TOKEN(ch);
+
+          if (!c)
+            break;
+
+          switch (parser->header_state) {
+            case h_general:
+              break;
+
+            case h_C:
+              parser->index++;
+              parser->header_state = (c == 'o' ? h_CO : h_general);
+              break;
+
+            case h_CO:
+              parser->index++;
+              parser->header_state = (c == 'n' ? h_CON : h_general);
+              break;
+
+            case h_CON:
+              parser->index++;
+              switch (c) {
+                case 'n':
+                  parser->header_state = h_matching_connection;
+                  break;
+                case 't':
+                  parser->header_state = h_matching_content_length;
+                  break;
+                default:
+                  parser->header_state = h_general;
+                  break;
+              }
+              break;
+
+            /* connection */
+
+            case h_matching_connection:
+              parser->index++;
+              if (parser->index > sizeof(CONNECTION)-1
+                  || c != CONNECTION[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(CONNECTION)-2) {
+                parser->header_state = h_connection;
+              }
+              break;
+
+            /* proxy-connection */
+
+            case h_matching_proxy_connection:
+              parser->index++;
+              if (parser->index > sizeof(PROXY_CONNECTION)-1
+                  || c != PROXY_CONNECTION[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(PROXY_CONNECTION)-2) {
+                parser->header_state = h_connection;
+              }
+              break;
+
+            /* content-length */
+
+            case h_matching_content_length:
+              parser->index++;
+              if (parser->index > sizeof(CONTENT_LENGTH)-1
+                  || c != CONTENT_LENGTH[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(CONTENT_LENGTH)-2) {
+                parser->header_state = h_content_length;
+              }
+              break;
+
+            /* transfer-encoding */
+
+            case h_matching_transfer_encoding:
+              parser->index++;
+              if (parser->index > sizeof(TRANSFER_ENCODING)-1
+                  || c != TRANSFER_ENCODING[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) {
+                parser->header_state = h_transfer_encoding;
+              }
+              break;
+
+            /* upgrade */
+
+            case h_matching_upgrade:
+              parser->index++;
+              if (parser->index > sizeof(UPGRADE)-1
+                  || c != UPGRADE[parser->index]) {
+                parser->header_state = h_general;
+              } else if (parser->index == sizeof(UPGRADE)-2) {
+                parser->header_state = h_upgrade;
+              }
+              break;
+
+            case h_connection:
+            case h_content_length:
+            case h_transfer_encoding:
+            case h_upgrade:
+              if (ch != ' ') parser->header_state = h_general;
+              break;
+
+            default:
+              assert(0 && "Unknown header_state");
+              break;
+          }
+        }
+
+        COUNT_HEADER_SIZE(p - start);
+
+        if (p == data + len) {
+          --p;
+          break;
+        }
+
+        if (ch == ':') {
+          UPDATE_STATE(s_header_value_discard_ws);
+          CALLBACK_DATA(header_field);
+          break;
+        }
+
+        SET_ERRNO(HPE_INVALID_HEADER_TOKEN);
+        goto error;
+      }
+
+      case s_header_value_discard_ws:
+        if (ch == ' ' || ch == '\t') break;
+
+        if (ch == CR) {
+          UPDATE_STATE(s_header_value_discard_ws_almost_done);
+          break;
+        }
+
+        if (ch == LF) {
+          UPDATE_STATE(s_header_value_discard_lws);
+          break;
+        }
+
+        /* FALLTHROUGH */
+
+      case s_header_value_start:
+      {
+        MARK(header_value);
+
+        UPDATE_STATE(s_header_value);
+        parser->index = 0;
+
+        c = LOWER(ch);
+
+        switch (parser->header_state) {
+          case h_upgrade:
+            parser->flags |= F_UPGRADE;
+            parser->header_state = h_general;
+            break;
+
+          case h_transfer_encoding:
+            /* looking for 'Transfer-Encoding: chunked' */
+            if ('c' == c) {
+              parser->header_state = h_matching_transfer_encoding_chunked;
+            } else {
+              parser->header_state = h_general;
+            }
+            break;
+
+          case h_content_length:
+            if (UNLIKELY(!IS_NUM(ch))) {
+              SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+              goto error;
+            }
+
+            parser->content_length = ch - '0';
+            break;
+
+          case h_connection:
+            /* looking for 'Connection: keep-alive' */
+            if (c == 'k') {
+              parser->header_state = h_matching_connection_keep_alive;
+            /* looking for 'Connection: close' */
+            } else if (c == 'c') {
+              parser->header_state = h_matching_connection_close;
+            } else if (c == 'u') {
+              parser->header_state = h_matching_connection_upgrade;
+            } else {
+              parser->header_state = h_matching_connection_token;
+            }
+            break;
+
+          /* Multi-value `Connection` header */
+          case h_matching_connection_token_start:
+            break;
+
+          default:
+            parser->header_state = h_general;
+            break;
+        }
+        break;
+      }
+
+      case s_header_value:
+      {
+        const char* start = p;
+        enum header_states h_state = (enum header_states) parser->header_state;
+        for (; p != data + len; p++) {
+          ch = *p;
+          if (ch == CR) {
+            UPDATE_STATE(s_header_almost_done);
+            parser->header_state = h_state;
+            CALLBACK_DATA(header_value);
+            break;
+          }
+
+          if (ch == LF) {
+            UPDATE_STATE(s_header_almost_done);
+            COUNT_HEADER_SIZE(p - start);
+            parser->header_state = h_state;
+            CALLBACK_DATA_NOADVANCE(header_value);
+            REEXECUTE();
+          }
+
+          c = LOWER(ch);
+
+          switch (h_state) {
+            case h_general:
+            {
+              const char* p_cr;
+              const char* p_lf;
+              size_t limit = data + len - p;
+
+              limit = MIN(limit, HTTP_MAX_HEADER_SIZE);
+
+              p_cr = (const char*) memchr(p, CR, limit);
+              p_lf = (const char*) memchr(p, LF, limit);
+              if (p_cr != NULL) {
+                if (p_lf != NULL && p_cr >= p_lf)
+                  p = p_lf;
+                else
+                  p = p_cr;
+              } else if (UNLIKELY(p_lf != NULL)) {
+                p = p_lf;
+              } else {
+                p = data + len;
+              }
+              --p;
+
+              break;
+            }
+
+            case h_connection:
+            case h_transfer_encoding:
+              assert(0 && "Shouldn't get here.");
+              break;
+
+            case h_content_length:
+            {
+              uint64_t t;
+
+              if (ch == ' ') break;
+
+              if (UNLIKELY(!IS_NUM(ch))) {
+                SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+                parser->header_state = h_state;
+                goto error;
+              }
+
+              t = parser->content_length;
+              t *= 10;
+              t += ch - '0';
+
+              /* Overflow? Test against a conservative limit for simplicity. */
+              if (UNLIKELY((ULLONG_MAX - 10) / 10 < parser->content_length)) {
+                SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+                parser->header_state = h_state;
+                goto error;
+              }
+
+              parser->content_length = t;
+              break;
+            }
+
+            /* Transfer-Encoding: chunked */
+            case h_matching_transfer_encoding_chunked:
+              parser->index++;
+              if (parser->index > sizeof(CHUNKED)-1
+                  || c != CHUNKED[parser->index]) {
+                h_state = h_general;
+              } else if (parser->index == sizeof(CHUNKED)-2) {
+                h_state = h_transfer_encoding_chunked;
+              }
+              break;
+
+            case h_matching_connection_token_start:
+              /* looking for 'Connection: keep-alive' */
+              if (c == 'k') {
+                h_state = h_matching_connection_keep_alive;
+              /* looking for 'Connection: close' */
+              } else if (c == 'c') {
+                h_state = h_matching_connection_close;
+              } else if (c == 'u') {
+                h_state = h_matching_connection_upgrade;
+              } else if (STRICT_TOKEN(c)) {
+                h_state = h_matching_connection_token;
+              } else if (c == ' ' || c == '\t') {
+                /* Skip lws */
+              } else {
+                h_state = h_general;
+              }
+              break;
+
+            /* looking for 'Connection: keep-alive' */
+            case h_matching_connection_keep_alive:
+              parser->index++;
+              if (parser->index > sizeof(KEEP_ALIVE)-1
+                  || c != KEEP_ALIVE[parser->index]) {
+                h_state = h_matching_connection_token;
+              } else if (parser->index == sizeof(KEEP_ALIVE)-2) {
+                h_state = h_connection_keep_alive;
+              }
+              break;
+
+            /* looking for 'Connection: close' */
+            case h_matching_connection_close:
+              parser->index++;
+              if (parser->index > sizeof(CLOSE)-1 || c != CLOSE[parser->index]) {
+                h_state = h_matching_connection_token;
+              } else if (parser->index == sizeof(CLOSE)-2) {
+                h_state = h_connection_close;
+              }
+              break;
+
+            /* looking for 'Connection: upgrade' */
+            case h_matching_connection_upgrade:
+              parser->index++;
+              if (parser->index > sizeof(UPGRADE) - 1 ||
+                  c != UPGRADE[parser->index]) {
+                h_state = h_matching_connection_token;
+              } else if (parser->index == sizeof(UPGRADE)-2) {
+                h_state = h_connection_upgrade;
+              }
+              break;
+
+            case h_matching_connection_token:
+              if (ch == ',') {
+                h_state = h_matching_connection_token_start;
+                parser->index = 0;
+              }
+              break;
+
+            case h_transfer_encoding_chunked:
+              if (ch != ' ') h_state = h_general;
+              break;
+
+            case h_connection_keep_alive:
+            case h_connection_close:
+            case h_connection_upgrade:
+              if (ch == ',') {
+                if (h_state == h_connection_keep_alive) {
+                  parser->flags |= F_CONNECTION_KEEP_ALIVE;
+                } else if (h_state == h_connection_close) {
+                  parser->flags |= F_CONNECTION_CLOSE;
+                } else if (h_state == h_connection_upgrade) {
+                  parser->flags |= F_CONNECTION_UPGRADE;
+                }
+                h_state = h_matching_connection_token_start;
+                parser->index = 0;
+              } else if (ch != ' ') {
+                h_state = h_matching_connection_token;
+              }
+              break;
+
+            default:
+              UPDATE_STATE(s_header_value);
+              h_state = h_general;
+              break;
+          }
+        }
+        parser->header_state = h_state;
+
+        COUNT_HEADER_SIZE(p - start);
+
+        if (p == data + len)
+          --p;
+        break;
+      }
+
+      case s_header_almost_done:
+      {
+        STRICT_CHECK(ch != LF);
+
+        UPDATE_STATE(s_header_value_lws);
+        break;
+      }
+
+      case s_header_value_lws:
+      {
+        if (ch == ' ' || ch == '\t') {
+          UPDATE_STATE(s_header_value_start);
+          REEXECUTE();
+        }
+
+        /* finished the header */
+        switch (parser->header_state) {
+          case h_connection_keep_alive:
+            parser->flags |= F_CONNECTION_KEEP_ALIVE;
+            break;
+          case h_connection_close:
+            parser->flags |= F_CONNECTION_CLOSE;
+            break;
+          case h_transfer_encoding_chunked:
+            parser->flags |= F_CHUNKED;
+            break;
+          case h_connection_upgrade:
+            parser->flags |= F_CONNECTION_UPGRADE;
+            break;
+          default:
+            break;
+        }
+
+        UPDATE_STATE(s_header_field_start);
+        REEXECUTE();
+      }
+
+      case s_header_value_discard_ws_almost_done:
+      {
+        STRICT_CHECK(ch != LF);
+        UPDATE_STATE(s_header_value_discard_lws);
+        break;
+      }
+
+      case s_header_value_discard_lws:
+      {
+        if (ch == ' ' || ch == '\t') {
+          UPDATE_STATE(s_header_value_discard_ws);
+          break;
+        } else {
+          switch (parser->header_state) {
+            case h_connection_keep_alive:
+              parser->flags |= F_CONNECTION_KEEP_ALIVE;
+              break;
+            case h_connection_close:
+              parser->flags |= F_CONNECTION_CLOSE;
+              break;
+            case h_connection_upgrade:
+              parser->flags |= F_CONNECTION_UPGRADE;
+              break;
+            case h_transfer_encoding_chunked:
+              parser->flags |= F_CHUNKED;
+              break;
+            default:
+              break;
+          }
+
+          /* header value was empty */
+          MARK(header_value);
+          UPDATE_STATE(s_header_field_start);
+          CALLBACK_DATA_NOADVANCE(header_value);
+          REEXECUTE();
+        }
+      }
+
+      case s_headers_almost_done:
+      {
+        STRICT_CHECK(ch != LF);
+
+        if (parser->flags & F_TRAILING) {
+          /* End of a chunked request */
+          UPDATE_STATE(s_message_done);
+          CALLBACK_NOTIFY_NOADVANCE(chunk_complete);
+          REEXECUTE();
+        }
+
+        UPDATE_STATE(s_headers_done);
+
+        /* Set this here so that on_headers_complete() callbacks can see it */
+        parser->upgrade =
+          ((parser->flags & (F_UPGRADE | F_CONNECTION_UPGRADE)) ==
+           (F_UPGRADE | F_CONNECTION_UPGRADE) ||
+           parser->method == HTTP_CONNECT);
+
+        /* Here we call the headers_complete callback. This is somewhat
+         * different than other callbacks because if the user returns 1, we
+         * will interpret that as saying that this message has no body. This
+         * is needed for the annoying case of recieving a response to a HEAD
+         * request.
+         *
+         * We'd like to use CALLBACK_NOTIFY_NOADVANCE() here but we cannot, so
+         * we have to simulate it by handling a change in errno below.
+         */
+        if (settings->on_headers_complete) {
+          switch (settings->on_headers_complete(parser)) {
+            case 0:
+              break;
+
+            case 1:
+              parser->flags |= F_SKIPBODY;
+              break;
+
+            default:
+              SET_ERRNO(HPE_CB_headers_complete);
+              RETURN(p - data); /* Error */
+          }
+        }
+
+        if (HTTP_PARSER_ERRNO(parser) != HPE_OK) {
+          RETURN(p - data);
+        }
+
+        REEXECUTE();
+      }
+
+      case s_headers_done:
+      {
+        STRICT_CHECK(ch != LF);
+
+        parser->nread = 0;
+
+        int hasBody = parser->flags & F_CHUNKED ||
+          (parser->content_length > 0 && parser->content_length != ULLONG_MAX);
+        if (parser->upgrade && (parser->method == HTTP_CONNECT ||
+                                (parser->flags & F_SKIPBODY) || !hasBody)) {
+          /* Exit, the rest of the message is in a different protocol. */
+          UPDATE_STATE(NEW_MESSAGE());
+          CALLBACK_NOTIFY(message_complete);
+          RETURN((p - data) + 1);
+        }
+
+        if (parser->flags & F_SKIPBODY) {
+          UPDATE_STATE(NEW_MESSAGE());
+          CALLBACK_NOTIFY(message_complete);
+        } else if (parser->flags & F_CHUNKED) {
+          /* chunked encoding - ignore Content-Length header */
+          UPDATE_STATE(s_chunk_size_start);
+        } else {
+          if (parser->content_length == 0) {
+            /* Content-Length header given but zero: Content-Length: 0\r\n */
+            UPDATE_STATE(NEW_MESSAGE());
+            CALLBACK_NOTIFY(message_complete);
+          } else if (parser->content_length != ULLONG_MAX) {
+            /* Content-Length header given and non-zero */
+            UPDATE_STATE(s_body_identity);
+          } else {
+            if (parser->type == HTTP_REQUEST ||
+                !http_message_needs_eof(parser)) {
+              /* Assume content-length 0 - read the next */
+              UPDATE_STATE(NEW_MESSAGE());
+              CALLBACK_NOTIFY(message_complete);
+            } else {
+              /* Read body until EOF */
+              UPDATE_STATE(s_body_identity_eof);
+            }
+          }
+        }
+
+        break;
+      }
+
+      case s_body_identity:
+      {
+        uint64_t to_read = MIN(parser->content_length,
+                               (uint64_t) ((data + len) - p));
+
+        assert(parser->content_length != 0
+            && parser->content_length != ULLONG_MAX);
+
+        /* The difference between advancing content_length and p is because
+         * the latter will automaticaly advance on the next loop iteration.
+         * Further, if content_length ends up at 0, we want to see the last
+         * byte again for our message complete callback.
+         */
+        MARK(body);
+        parser->content_length -= to_read;
+        p += to_read - 1;
+
+        if (parser->content_length == 0) {
+          UPDATE_STATE(s_message_done);
+
+          /* Mimic CALLBACK_DATA_NOADVANCE() but with one extra byte.
+           *
+           * The alternative to doing this is to wait for the next byte to
+           * trigger the data callback, just as in every other case. The
+           * problem with this is that this makes it difficult for the test
+           * harness to distinguish between complete-on-EOF and
+           * complete-on-length. It's not clear that this distinction is
+           * important for applications, but let's keep it for now.
+           */
+          CALLBACK_DATA_(body, p - body_mark + 1, p - data);
+          REEXECUTE();
+        }
+
+        break;
+      }
+
+      /* read until EOF */
+      case s_body_identity_eof:
+        MARK(body);
+        p = data + len - 1;
+
+        break;
+
+      case s_message_done:
+        UPDATE_STATE(NEW_MESSAGE());
+        CALLBACK_NOTIFY(message_complete);
+        if (parser->upgrade) {
+          /* Exit, the rest of the message is in a different protocol. */
+          RETURN((p - data) + 1);
+        }
+        break;
+
+      case s_chunk_size_start:
+      {
+        assert(parser->nread == 1);
+        assert(parser->flags & F_CHUNKED);
+
+        unhex_val = unhex[(unsigned char)ch];
+        if (UNLIKELY(unhex_val == -1)) {
+          SET_ERRNO(HPE_INVALID_CHUNK_SIZE);
+          goto error;
+        }
+
+        parser->content_length = unhex_val;
+        UPDATE_STATE(s_chunk_size);
+        break;
+      }
+
+      case s_chunk_size:
+      {
+        uint64_t t;
+
+        assert(parser->flags & F_CHUNKED);
+
+        if (ch == CR) {
+          UPDATE_STATE(s_chunk_size_almost_done);
+          break;
+        }
+
+        unhex_val = unhex[(unsigned char)ch];
+
+        if (unhex_val == -1) {
+          if (ch == ';' || ch == ' ') {
+            UPDATE_STATE(s_chunk_parameters);
+            break;
+          }
+
+          SET_ERRNO(HPE_INVALID_CHUNK_SIZE);
+          goto error;
+        }
+
+        t = parser->content_length;
+        t *= 16;
+        t += unhex_val;
+
+        /* Overflow? Test against a conservative limit for simplicity. */
+        if (UNLIKELY((ULLONG_MAX - 16) / 16 < parser->content_length)) {
+          SET_ERRNO(HPE_INVALID_CONTENT_LENGTH);
+          goto error;
+        }
+
+        parser->content_length = t;
+        break;
+      }
+
+      case s_chunk_parameters:
+      {
+        assert(parser->flags & F_CHUNKED);
+        /* just ignore this shit. TODO check for overflow */
+        if (ch == CR) {
+          UPDATE_STATE(s_chunk_size_almost_done);
+          break;
+        }
+        break;
+      }
+
+      case s_chunk_size_almost_done:
+      {
+        assert(parser->flags & F_CHUNKED);
+        STRICT_CHECK(ch != LF);
+
+        parser->nread = 0;
+
+        if (parser->content_length == 0) {
+          parser->flags |= F_TRAILING;
+          UPDATE_STATE(s_header_field_start);
+        } else {
+          UPDATE_STATE(s_chunk_data);
+        }
+        CALLBACK_NOTIFY(chunk_header);
+        break;
+      }
+
+      case s_chunk_data:
+      {
+        uint64_t to_read = MIN(parser->content_length,
+                               (uint64_t) ((data + len) - p));
+
+        assert(parser->flags & F_CHUNKED);
+        assert(parser->content_length != 0
+            && parser->content_length != ULLONG_MAX);
+
+        /* See the explanation in s_body_identity for why the content
+         * length and data pointers are managed this way.
+         */
+        MARK(body);
+        parser->content_length -= to_read;
+        p += to_read - 1;
+
+        if (parser->content_length == 0) {
+          UPDATE_STATE(s_chunk_data_almost_done);
+        }
+
+        break;
+      }
+
+      case s_chunk_data_almost_done:
+        assert(parser->flags & F_CHUNKED);
+        assert(parser->content_length == 0);
+        STRICT_CHECK(ch != CR);
+        UPDATE_STATE(s_chunk_data_done);
+        CALLBACK_DATA(body);
+        break;
+
+      case s_chunk_data_done:
+        assert(parser->flags & F_CHUNKED);
+        STRICT_CHECK(ch != LF);
+        parser->nread = 0;
+        UPDATE_STATE(s_chunk_size_start);
+        CALLBACK_NOTIFY(chunk_complete);
+        break;
+
+      default:
+        assert(0 && "unhandled state");
+        SET_ERRNO(HPE_INVALID_INTERNAL_STATE);
+        goto error;
+    }
+  }
+
+  /* Run callbacks for any marks that we have leftover after we ran our of
+   * bytes. There should be at most one of these set, so it's OK to invoke
+   * them in series (unset marks will not result in callbacks).
+   *
+   * We use the NOADVANCE() variety of callbacks here because 'p' has already
+   * overflowed 'data' and this allows us to correct for the off-by-one that
+   * we'd otherwise have (since CALLBACK_DATA() is meant to be run with a 'p'
+   * value that's in-bounds).
+   */
+
+  assert(((header_field_mark ? 1 : 0) +
+          (header_value_mark ? 1 : 0) +
+          (url_mark ? 1 : 0)  +
+          (body_mark ? 1 : 0) +
+          (status_mark ? 1 : 0)) <= 1);
+
+  CALLBACK_DATA_NOADVANCE(header_field);
+  CALLBACK_DATA_NOADVANCE(header_value);
+  CALLBACK_DATA_NOADVANCE(url);
+  CALLBACK_DATA_NOADVANCE(body);
+  CALLBACK_DATA_NOADVANCE(status);
+
+  RETURN(len);
+
+error:
+  if (HTTP_PARSER_ERRNO(parser) == HPE_OK) {
+    SET_ERRNO(HPE_UNKNOWN);
+  }
+
+  RETURN(p - data);
+}
+
+
+/* Does the parser need to see an EOF to find the end of the message? */
+int
+http_message_needs_eof (const http_parser *parser)
+{
+  if (parser->type == HTTP_REQUEST) {
+    return 0;
+  }
+
+  /* See RFC 2616 section 4.4 */
+  if (parser->status_code / 100 == 1 || /* 1xx e.g. Continue */
+      parser->status_code == 204 ||     /* No Content */
+      parser->status_code == 304 ||     /* Not Modified */
+      parser->flags & F_SKIPBODY) {     /* response to a HEAD request */
+    return 0;
+  }
+
+  if ((parser->flags & F_CHUNKED) || parser->content_length != ULLONG_MAX) {
+    return 0;
+  }
+
+  return 1;
+}
+
+
+int
+http_should_keep_alive (const http_parser *parser)
+{
+  if (parser->http_major > 0 && parser->http_minor > 0) {
+    /* HTTP/1.1 */
+    if (parser->flags & F_CONNECTION_CLOSE) {
+      return 0;
+    }
+  } else {
+    /* HTTP/1.0 or earlier */
+    if (!(parser->flags & F_CONNECTION_KEEP_ALIVE)) {
+      return 0;
+    }
+  }
+
+  return !http_message_needs_eof(parser);
+}
+
+
+const char *
+http_method_str (enum http_method m)
+{
+  return ELEM_AT(method_strings, m, "<unknown>");
+}
+
+
+void
+http_parser_init (http_parser *parser, enum http_parser_type t)
+{
+  void *data = parser->data; /* preserve application data */
+  memset(parser, 0, sizeof(*parser));
+  parser->data = data;
+  parser->type = t;
+  parser->state = (t == HTTP_REQUEST ? s_start_req : (t == HTTP_RESPONSE ? s_start_res : s_start_req_or_res));
+  parser->http_errno = HPE_OK;
+}
+
+void
+http_parser_settings_init(http_parser_settings *settings)
+{
+  memset(settings, 0, sizeof(*settings));
+}
+
+const char *
+http_errno_name(enum http_errno err) {
+  assert(((size_t) err) <
+      (sizeof(http_strerror_tab) / sizeof(http_strerror_tab[0])));
+  return http_strerror_tab[err].name;
+}
+
+const char *
+http_errno_description(enum http_errno err) {
+  assert(((size_t) err) <
+      (sizeof(http_strerror_tab) / sizeof(http_strerror_tab[0])));
+  return http_strerror_tab[err].description;
+}
+
+static enum http_host_state
+http_parse_host_char(enum http_host_state s, const char ch) {
+  switch(s) {
+    case s_http_userinfo:
+    case s_http_userinfo_start:
+      if (ch == '@') {
+        return s_http_host_start;
+      }
+
+      if (IS_USERINFO_CHAR(ch)) {
+        return s_http_userinfo;
+      }
+      break;
+
+    case s_http_host_start:
+      if (ch == '[') {
+        return s_http_host_v6_start;
+      }
+
+      if (IS_HOST_CHAR(ch)) {
+        return s_http_host;
+      }
+
+      break;
+
+    case s_http_host:
+      if (IS_HOST_CHAR(ch)) {
+        return s_http_host;
+      }
+
+    /* FALLTHROUGH */
+    case s_http_host_v6_end:
+      if (ch == ':') {
+        return s_http_host_port_start;
+      }
+
+      break;
+
+    case s_http_host_v6:
+      if (ch == ']') {
+        return s_http_host_v6_end;
+      }
+
+    /* FALLTHROUGH */
+    case s_http_host_v6_start:
+      if (IS_HEX(ch) || ch == ':' || ch == '.') {
+        return s_http_host_v6;
+      }
+
+      break;
+
+    case s_http_host_port:
+    case s_http_host_port_start:
+      if (IS_NUM(ch)) {
+        return s_http_host_port;
+      }
+
+      break;
+
+    default:
+      break;
+  }
+  return s_http_host_dead;
+}
+
+static int
+http_parse_host(const char * buf, struct http_parser_url *u, int found_at) {
+  enum http_host_state s;
+
+  const char *p;
+  size_t buflen = u->field_data[UF_HOST].off + u->field_data[UF_HOST].len;
+
+  u->field_data[UF_HOST].len = 0;
+
+  s = found_at ? s_http_userinfo_start : s_http_host_start;
+
+  for (p = buf + u->field_data[UF_HOST].off; p < buf + buflen; p++) {
+    enum http_host_state new_s = http_parse_host_char(s, *p);
+
+    if (new_s == s_http_host_dead) {
+      return 1;
+    }
+
+    switch(new_s) {
+      case s_http_host:
+        if (s != s_http_host) {
+          u->field_data[UF_HOST].off = p - buf;
+        }
+        u->field_data[UF_HOST].len++;
+        break;
+
+      case s_http_host_v6:
+        if (s != s_http_host_v6) {
+          u->field_data[UF_HOST].off = p - buf;
+        }
+        u->field_data[UF_HOST].len++;
+        break;
+
+      case s_http_host_port:
+        if (s != s_http_host_port) {
+          u->field_data[UF_PORT].off = p - buf;
+          u->field_data[UF_PORT].len = 0;
+          u->field_set |= (1 << UF_PORT);
+        }
+        u->field_data[UF_PORT].len++;
+        break;
+
+      case s_http_userinfo:
+        if (s != s_http_userinfo) {
+          u->field_data[UF_USERINFO].off = p - buf ;
+          u->field_data[UF_USERINFO].len = 0;
+          u->field_set |= (1 << UF_USERINFO);
+        }
+        u->field_data[UF_USERINFO].len++;
+        break;
+
+      default:
+        break;
+    }
+    s = new_s;
+  }
+
+  /* Make sure we don't end somewhere unexpected */
+  switch (s) {
+    case s_http_host_start:
+    case s_http_host_v6_start:
+    case s_http_host_v6:
+    case s_http_host_port_start:
+    case s_http_userinfo:
+    case s_http_userinfo_start:
+      return 1;
+    default:
+      break;
+  }
+
+  return 0;
+}
+
+int
+http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
+                      struct http_parser_url *u)
+{
+  enum state s;
+  const char *p;
+  enum http_parser_url_fields uf, old_uf;
+  int found_at = 0;
+
+  u->port = u->field_set = 0;
+  s = is_connect ? s_req_server_start : s_req_spaces_before_url;
+  old_uf = UF_MAX;
+
+  for (p = buf; p < buf + buflen; p++) {
+    s = parse_url_char(s, *p);
+
+    /* Figure out the next field that we're operating on */
+    switch (s) {
+      case s_dead:
+        return 1;
+
+      /* Skip delimeters */
+      case s_req_schema_slash:
+      case s_req_schema_slash_slash:
+      case s_req_server_start:
+      case s_req_query_string_start:
+      case s_req_fragment_start:
+        continue;
+
+      case s_req_schema:
+        uf = UF_SCHEMA;
+        break;
+
+      case s_req_server_with_at:
+        found_at = 1;
+
+      /* FALLTROUGH */
+      case s_req_server:
+        uf = UF_HOST;
+        break;
+
+      case s_req_path:
+        uf = UF_PATH;
+        break;
+
+      case s_req_query_string:
+        uf = UF_QUERY;
+        break;
+
+      case s_req_fragment:
+        uf = UF_FRAGMENT;
+        break;
+
+      default:
+        assert(!"Unexpected state");
+        return 1;
+    }
+
+    /* Nothing's changed; soldier on */
+    if (uf == old_uf) {
+      u->field_data[uf].len++;
+      continue;
+    }
+
+    u->field_data[uf].off = p - buf;
+    u->field_data[uf].len = 1;
+
+    u->field_set |= (1 << uf);
+    old_uf = uf;
+  }
+
+  /* host must be present if there is a schema */
+  /* parsing http:///toto will fail */
+  if ((u->field_set & ((1 << UF_SCHEMA) | (1 << UF_HOST))) != 0) {
+    if (http_parse_host(buf, u, found_at) != 0) {
+      return 1;
+    }
+  }
+
+  /* CONNECT requests can only contain "hostname:port" */
+  if (is_connect && u->field_set != ((1 << UF_HOST)|(1 << UF_PORT))) {
+    return 1;
+  }
+
+  if (u->field_set & (1 << UF_PORT)) {
+    /* Don't bother with endp; we've already validated the string */
+    unsigned long v = strtoul(buf + u->field_data[UF_PORT].off, NULL, 10);
+
+    /* Ports have a max value of 2^16 */
+    if (v > 0xffff) {
+      return 1;
+    }
+
+    u->port = (uint16_t) v;
+  }
+
+  return 0;
+}
+
+void
+http_parser_pause(http_parser *parser, int paused) {
+  /* Users should only be pausing/unpausing a parser that is not in an error
+   * state. In non-debug builds, there's not much that we can do about this
+   * other than ignore it.
+   */
+  if (HTTP_PARSER_ERRNO(parser) == HPE_OK ||
+      HTTP_PARSER_ERRNO(parser) == HPE_PAUSED) {
+    SET_ERRNO((paused) ? HPE_PAUSED : HPE_OK);
+  } else {
+    assert(0 && "Attempting to pause parser in error state");
+  }
+}
+
+int
+http_body_is_final(const struct http_parser *parser) {
+    return parser->state == s_message_done;
+}
+
+unsigned long
+http_parser_version(void) {
+  return HTTP_PARSER_VERSION_MAJOR * 0x10000 |
+         HTTP_PARSER_VERSION_MINOR * 0x00100 |
+         HTTP_PARSER_VERSION_PATCH * 0x00001;
+}
diff --git a/external/qhttpserver/http-parser/http_parser.gyp b/external/qhttpserver/http-parser/http_parser.gyp
new file mode 100755
index 0000000..ef34eca
--- /dev/null
+++ b/external/qhttpserver/http-parser/http_parser.gyp
@@ -0,0 +1,111 @@
+# This file is used with the GYP meta build system.
+# http://code.google.com/p/gyp/
+# To build try this:
+#   svn co http://gyp.googlecode.com/svn/trunk gyp
+#   ./gyp/gyp -f make --depth=`pwd` http_parser.gyp 
+#   ./out/Debug/test 
+{
+  'target_defaults': {
+    'default_configuration': 'Debug',
+    'configurations': {
+      # TODO: hoist these out and put them somewhere common, because
+      #       RuntimeLibrary MUST MATCH across the entire project
+      'Debug': {
+        'defines': [ 'DEBUG', '_DEBUG' ],
+        'cflags': [ '-Wall', '-Wextra', '-O0', '-g', '-ftrapv' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 1, # static debug
+          },
+        },
+      },
+      'Release': {
+        'defines': [ 'NDEBUG' ],
+        'cflags': [ '-Wall', '-Wextra', '-O3' ],
+        'msvs_settings': {
+          'VCCLCompilerTool': {
+            'RuntimeLibrary': 0, # static release
+          },
+        },
+      }
+    },
+    'msvs_settings': {
+      'VCCLCompilerTool': {
+      },
+      'VCLibrarianTool': {
+      },
+      'VCLinkerTool': {
+        'GenerateDebugInformation': 'true',
+      },
+    },
+    'conditions': [
+      ['OS == "win"', {
+        'defines': [
+          'WIN32'
+        ],
+      }]
+    ],
+  },
+
+  'targets': [
+    {
+      'target_name': 'http_parser',
+      'type': 'static_library',
+      'include_dirs': [ '.' ],
+      'direct_dependent_settings': {
+        'defines': [ 'HTTP_PARSER_STRICT=0' ],
+        'include_dirs': [ '.' ],
+      },
+      'defines': [ 'HTTP_PARSER_STRICT=0' ],
+      'sources': [ './http_parser.c', ],
+      'conditions': [
+        ['OS=="win"', {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              # Compile as C++. http_parser.c is actually C99, but C++ is
+              # close enough in this case.
+              'CompileAs': 2,
+            },
+          },
+        }]
+      ],
+    },
+
+    {
+      'target_name': 'http_parser_strict',
+      'type': 'static_library',
+      'include_dirs': [ '.' ],
+      'direct_dependent_settings': {
+        'defines': [ 'HTTP_PARSER_STRICT=1' ],
+        'include_dirs': [ '.' ],
+      },
+      'defines': [ 'HTTP_PARSER_STRICT=1' ],
+      'sources': [ './http_parser.c', ],
+      'conditions': [
+        ['OS=="win"', {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+              # Compile as C++. http_parser.c is actually C99, but C++ is
+              # close enough in this case.
+              'CompileAs': 2,
+            },
+          },
+        }]
+      ],
+    },
+
+    {
+      'target_name': 'test-nonstrict',
+      'type': 'executable',
+      'dependencies': [ 'http_parser' ],
+      'sources': [ 'test.c' ]
+    },
+
+    {
+      'target_name': 'test-strict',
+      'type': 'executable',
+      'dependencies': [ 'http_parser_strict' ],
+      'sources': [ 'test.c' ]
+    }
+  ]
+}
diff --git a/external/qhttpserver/http-parser/http_parser.h b/external/qhttpserver/http-parser/http_parser.h
new file mode 100755
index 0000000..eb71bf9
--- /dev/null
+++ b/external/qhttpserver/http-parser/http_parser.h
@@ -0,0 +1,342 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#ifndef http_parser_h
+#define http_parser_h
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Also update SONAME in the Makefile whenever you change these. */
+#define HTTP_PARSER_VERSION_MAJOR 2
+#define HTTP_PARSER_VERSION_MINOR 5
+#define HTTP_PARSER_VERSION_PATCH 0
+
+#include <sys/types.h>
+#if defined(_WIN32) && !defined(__MINGW32__) && (!defined(_MSC_VER) || _MSC_VER<1600)
+#include <BaseTsd.h>
+#include <stddef.h>
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <stdint.h>
+#endif
+
+/* Compile with -DHTTP_PARSER_STRICT=0 to make less checks, but run
+ * faster
+ */
+#ifndef HTTP_PARSER_STRICT
+# define HTTP_PARSER_STRICT 1
+#endif
+
+/* Maximium header size allowed. If the macro is not defined
+ * before including this header then the default is used. To
+ * change the maximum header size, define the macro in the build
+ * environment (e.g. -DHTTP_MAX_HEADER_SIZE=<value>). To remove
+ * the effective limit on the size of the header, define the macro
+ * to a very large number (e.g. -DHTTP_MAX_HEADER_SIZE=0x7fffffff)
+ */
+#ifndef HTTP_MAX_HEADER_SIZE
+# define HTTP_MAX_HEADER_SIZE (80*1024)
+#endif
+
+typedef struct http_parser http_parser;
+typedef struct http_parser_settings http_parser_settings;
+
+
+/* Callbacks should return non-zero to indicate an error. The parser will
+ * then halt execution.
+ *
+ * The one exception is on_headers_complete. In a HTTP_RESPONSE parser
+ * returning '1' from on_headers_complete will tell the parser that it
+ * should not expect a body. This is used when receiving a response to a
+ * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
+ * chunked' headers that indicate the presence of a body.
+ *
+ * http_data_cb does not return data chunks. It will be called arbitrarily
+ * many times for each string. E.G. you might get 10 callbacks for "on_url"
+ * each providing just a few characters more data.
+ */
+typedef int (*http_data_cb) (http_parser*, const char *at, size_t length);
+typedef int (*http_cb) (http_parser*);
+
+
+/* Request Methods */
+#define HTTP_METHOD_MAP(XX)         \
+  XX(0,  DELETE,      DELETE)       \
+  XX(1,  GET,         GET)          \
+  XX(2,  HEAD,        HEAD)         \
+  XX(3,  POST,        POST)         \
+  XX(4,  PUT,         PUT)          \
+  /* pathological */                \
+  XX(5,  CONNECT,     CONNECT)      \
+  XX(6,  OPTIONS,     OPTIONS)      \
+  XX(7,  TRACE,       TRACE)        \
+  /* webdav */                      \
+  XX(8,  COPY,        COPY)         \
+  XX(9,  LOCK,        LOCK)         \
+  XX(10, MKCOL,       MKCOL)        \
+  XX(11, MOVE,        MOVE)         \
+  XX(12, PROPFIND,    PROPFIND)     \
+  XX(13, PROPPATCH,   PROPPATCH)    \
+  XX(14, SEARCH,      SEARCH)       \
+  XX(15, UNLOCK,      UNLOCK)       \
+  /* subversion */                  \
+  XX(16, REPORT,      REPORT)       \
+  XX(17, MKACTIVITY,  MKACTIVITY)   \
+  XX(18, CHECKOUT,    CHECKOUT)     \
+  XX(19, MERGE,       MERGE)        \
+  /* upnp */                        \
+  XX(20, MSEARCH,     M-SEARCH)     \
+  XX(21, NOTIFY,      NOTIFY)       \
+  XX(22, SUBSCRIBE,   SUBSCRIBE)    \
+  XX(23, UNSUBSCRIBE, UNSUBSCRIBE)  \
+  /* RFC-5789 */                    \
+  XX(24, PATCH,       PATCH)        \
+  XX(25, PURGE,       PURGE)        \
+  /* CalDAV */                      \
+  XX(26, MKCALENDAR,  MKCALENDAR)   \
+
+enum http_method
+  {
+#define XX(num, name, string) HTTP_##name = num,
+  HTTP_METHOD_MAP(XX)
+#undef XX
+  };
+
+
+enum http_parser_type { HTTP_REQUEST, HTTP_RESPONSE, HTTP_BOTH };
+
+
+/* Flag values for http_parser.flags field */
+enum flags
+  { F_CHUNKED               = 1 << 0
+  , F_CONNECTION_KEEP_ALIVE = 1 << 1
+  , F_CONNECTION_CLOSE      = 1 << 2
+  , F_CONNECTION_UPGRADE    = 1 << 3
+  , F_TRAILING              = 1 << 4
+  , F_UPGRADE               = 1 << 5
+  , F_SKIPBODY              = 1 << 6
+  };
+
+
+/* Map for errno-related constants
+ * 
+ * The provided argument should be a macro that takes 2 arguments.
+ */
+#define HTTP_ERRNO_MAP(XX)                                           \
+  /* No error */                                                     \
+  XX(OK, "success")                                                  \
+                                                                     \
+  /* Callback-related errors */                                      \
+  XX(CB_message_begin, "the on_message_begin callback failed")       \
+  XX(CB_url, "the on_url callback failed")                           \
+  XX(CB_header_field, "the on_header_field callback failed")         \
+  XX(CB_header_value, "the on_header_value callback failed")         \
+  XX(CB_headers_complete, "the on_headers_complete callback failed") \
+  XX(CB_body, "the on_body callback failed")                         \
+  XX(CB_message_complete, "the on_message_complete callback failed") \
+  XX(CB_status, "the on_status callback failed")                     \
+  XX(CB_chunk_header, "the on_chunk_header callback failed")         \
+  XX(CB_chunk_complete, "the on_chunk_complete callback failed")     \
+                                                                     \
+  /* Parsing-related errors */                                       \
+  XX(INVALID_EOF_STATE, "stream ended at an unexpected time")        \
+  XX(HEADER_OVERFLOW,                                                \
+     "too many header bytes seen; overflow detected")                \
+  XX(CLOSED_CONNECTION,                                              \
+     "data received after completed connection: close message")      \
+  XX(INVALID_VERSION, "invalid HTTP version")                        \
+  XX(INVALID_STATUS, "invalid HTTP status code")                     \
+  XX(INVALID_METHOD, "invalid HTTP method")                          \
+  XX(INVALID_URL, "invalid URL")                                     \
+  XX(INVALID_HOST, "invalid host")                                   \
+  XX(INVALID_PORT, "invalid port")                                   \
+  XX(INVALID_PATH, "invalid path")                                   \
+  XX(INVALID_QUERY_STRING, "invalid query string")                   \
+  XX(INVALID_FRAGMENT, "invalid fragment")                           \
+  XX(LF_EXPECTED, "LF character expected")                           \
+  XX(INVALID_HEADER_TOKEN, "invalid character in header")            \
+  XX(INVALID_CONTENT_LENGTH,                                         \
+     "invalid character in content-length header")                   \
+  XX(INVALID_CHUNK_SIZE,                                             \
+     "invalid character in chunk size header")                       \
+  XX(INVALID_CONSTANT, "invalid constant string")                    \
+  XX(INVALID_INTERNAL_STATE, "encountered unexpected internal state")\
+  XX(STRICT, "strict mode assertion failed")                         \
+  XX(PAUSED, "parser is paused")                                     \
+  XX(UNKNOWN, "an unknown error occurred")
+
+
+/* Define HPE_* values for each errno value above */
+#define HTTP_ERRNO_GEN(n, s) HPE_##n,
+enum http_errno {
+  HTTP_ERRNO_MAP(HTTP_ERRNO_GEN)
+};
+#undef HTTP_ERRNO_GEN
+
+
+/* Get an http_errno value from an http_parser */
+#define HTTP_PARSER_ERRNO(p)            ((enum http_errno) (p)->http_errno)
+
+
+struct http_parser {
+  /** PRIVATE **/
+  unsigned int type : 2;         /* enum http_parser_type */
+  unsigned int flags : 7;        /* F_* values from 'flags' enum; semi-public */
+  unsigned int state : 7;        /* enum state from http_parser.c */
+  unsigned int header_state : 8; /* enum header_state from http_parser.c */
+  unsigned int index : 8;        /* index into current matcher */
+
+  uint32_t nread;          /* # bytes read in various scenarios */
+  uint64_t content_length; /* # bytes in body (0 if no Content-Length header) */
+
+  /** READ-ONLY **/
+  unsigned short http_major;
+  unsigned short http_minor;
+  unsigned int status_code : 16; /* responses only */
+  unsigned int method : 8;       /* requests only */
+  unsigned int http_errno : 7;
+
+  /* 1 = Upgrade header was present and the parser has exited because of that.
+   * 0 = No upgrade header present.
+   * Should be checked when http_parser_execute() returns in addition to
+   * error checking.
+   */
+  unsigned int upgrade : 1;
+
+  /** PUBLIC **/
+  void *data; /* A pointer to get hook to the "connection" or "socket" object */
+};
+
+
+struct http_parser_settings {
+  http_cb      on_message_begin;
+  http_data_cb on_url;
+  http_data_cb on_status;
+  http_data_cb on_header_field;
+  http_data_cb on_header_value;
+  http_cb      on_headers_complete;
+  http_data_cb on_body;
+  http_cb      on_message_complete;
+  /* When on_chunk_header is called, the current chunk length is stored
+   * in parser->content_length.
+   */
+  http_cb      on_chunk_header;
+  http_cb      on_chunk_complete;
+};
+
+
+enum http_parser_url_fields
+  { UF_SCHEMA           = 0
+  , UF_HOST             = 1
+  , UF_PORT             = 2
+  , UF_PATH             = 3
+  , UF_QUERY            = 4
+  , UF_FRAGMENT         = 5
+  , UF_USERINFO         = 6
+  , UF_MAX              = 7
+  };
+
+
+/* Result structure for http_parser_parse_url().
+ *
+ * Callers should index into field_data[] with UF_* values iff field_set
+ * has the relevant (1 << UF_*) bit set. As a courtesy to clients (and
+ * because we probably have padding left over), we convert any port to
+ * a uint16_t.
+ */
+struct http_parser_url {
+  uint16_t field_set;           /* Bitmask of (1 << UF_*) values */
+  uint16_t port;                /* Converted UF_PORT string */
+
+  struct {
+    uint16_t off;               /* Offset into buffer in which field starts */
+    uint16_t len;               /* Length of run in buffer */
+  } field_data[UF_MAX];
+};
+
+
+/* Returns the library version. Bits 16-23 contain the major version number,
+ * bits 8-15 the minor version number and bits 0-7 the patch level.
+ * Usage example:
+ *
+ *   unsigned long version = http_parser_version();
+ *   unsigned major = (version >> 16) & 255;
+ *   unsigned minor = (version >> 8) & 255;
+ *   unsigned patch = version & 255;
+ *   printf("http_parser v%u.%u.%u\n", major, minor, patch);
+ */
+unsigned long http_parser_version(void);
+
+void http_parser_init(http_parser *parser, enum http_parser_type type);
+
+
+/* Initialize http_parser_settings members to 0
+ */
+void http_parser_settings_init(http_parser_settings *settings);
+
+
+/* Executes the parser. Returns number of parsed bytes. Sets
+ * `parser->http_errno` on error. */
+size_t http_parser_execute(http_parser *parser,
+                           const http_parser_settings *settings,
+                           const char *data,
+                           size_t len);
+
+
+/* If http_should_keep_alive() in the on_headers_complete or
+ * on_message_complete callback returns 0, then this should be
+ * the last message on the connection.
+ * If you are the server, respond with the "Connection: close" header.
+ * If you are the client, close the connection.
+ */
+int http_should_keep_alive(const http_parser *parser);
+
+/* Returns a string version of the HTTP method. */
+const char *http_method_str(enum http_method m);
+
+/* Return a string name of the given error */
+const char *http_errno_name(enum http_errno err);
+
+/* Return a string description of the given error */
+const char *http_errno_description(enum http_errno err);
+
+/* Parse a URL; return nonzero on failure */
+int http_parser_parse_url(const char *buf, size_t buflen,
+                          int is_connect,
+                          struct http_parser_url *u);
+
+/* Pause or un-pause the parser; a nonzero value pauses */
+void http_parser_pause(http_parser *parser, int paused);
+
+/* Checks if this is the final chunk of the body. */
+int http_body_is_final(const http_parser *parser);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/external/qhttpserver/http-parser/test.c b/external/qhttpserver/http-parser/test.c
new file mode 100755
index 0000000..4c00571
--- /dev/null
+++ b/external/qhttpserver/http-parser/test.c
@@ -0,0 +1,3852 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+#include "http_parser.h"
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h> /* rand */
+#include <string.h>
+#include <stdarg.h>
+
+#if defined(__APPLE__)
+# undef strlcat
+# undef strlncpy
+# undef strlcpy
+#endif  /* defined(__APPLE__) */
+
+#undef TRUE
+#define TRUE 1
+#undef FALSE
+#define FALSE 0
+
+#define MAX_HEADERS 13
+#define MAX_ELEMENT_SIZE 2048
+#define MAX_CHUNKS 16
+
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
+
+static http_parser *parser;
+
+struct message {
+  const char *name; // for debugging purposes
+  const char *raw;
+  enum http_parser_type type;
+  enum http_method method;
+  int status_code;
+  char response_status[MAX_ELEMENT_SIZE];
+  char request_path[MAX_ELEMENT_SIZE];
+  char request_url[MAX_ELEMENT_SIZE];
+  char fragment[MAX_ELEMENT_SIZE];
+  char query_string[MAX_ELEMENT_SIZE];
+  char body[MAX_ELEMENT_SIZE];
+  size_t body_size;
+  const char *host;
+  const char *userinfo;
+  uint16_t port;
+  int num_headers;
+  enum { NONE=0, FIELD, VALUE } last_header_element;
+  char headers [MAX_HEADERS][2][MAX_ELEMENT_SIZE];
+  int should_keep_alive;
+
+  int num_chunks;
+  int num_chunks_complete;
+  int chunk_lengths[MAX_CHUNKS];
+
+  const char *upgrade; // upgraded body
+
+  unsigned short http_major;
+  unsigned short http_minor;
+
+  int message_begin_cb_called;
+  int headers_complete_cb_called;
+  int message_complete_cb_called;
+  int message_complete_on_eof;
+  int body_is_final;
+};
+
+static int currently_parsing_eof;
+
+static struct message messages[5];
+static int num_messages;
+static http_parser_settings *current_pause_parser;
+
+/* * R E Q U E S T S * */
+const struct message requests[] =
+#define CURL_GET 0
+{ {.name= "curl get"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /test HTTP/1.1\r\n"
+         "User-Agent: curl/7.18.0 (i486-pc-linux-gnu) libcurl/7.18.0 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/1.1\r\n"
+         "Host: 0.0.0.0=5000\r\n"
+         "Accept: */*\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/test"
+  ,.request_url= "/test"
+  ,.num_headers= 3
+  ,.headers=
+    { { "User-Agent", "curl/7.18.0 (i486-pc-linux-gnu) libcurl/7.18.0 OpenSSL/0.9.8g zlib/1.2.3.3 libidn/1.1" }
+    , { "Host", "0.0.0.0=5000" }
+    , { "Accept", "*/*" }
+    }
+  ,.body= ""
+  }
+
+#define FIREFOX_GET 1
+, {.name= "firefox get"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /favicon.ico HTTP/1.1\r\n"
+         "Host: 0.0.0.0=5000\r\n"
+         "User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9) Gecko/2008061015 Firefox/3.0\r\n"
+         "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"
+         "Accept-Language: en-us,en;q=0.5\r\n"
+         "Accept-Encoding: gzip,deflate\r\n"
+         "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r\n"
+         "Keep-Alive: 300\r\n"
+         "Connection: keep-alive\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/favicon.ico"
+  ,.request_url= "/favicon.ico"
+  ,.num_headers= 8
+  ,.headers=
+    { { "Host", "0.0.0.0=5000" }
+    , { "User-Agent", "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9) Gecko/2008061015 Firefox/3.0" }
+    , { "Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" }
+    , { "Accept-Language", "en-us,en;q=0.5" }
+    , { "Accept-Encoding", "gzip,deflate" }
+    , { "Accept-Charset", "ISO-8859-1,utf-8;q=0.7,*;q=0.7" }
+    , { "Keep-Alive", "300" }
+    , { "Connection", "keep-alive" }
+    }
+  ,.body= ""
+  }
+
+#define DUMBFUCK 2
+, {.name= "dumbfuck"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /dumbfuck HTTP/1.1\r\n"
+         "aaaaaaaaaaaaa:++++++++++\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/dumbfuck"
+  ,.request_url= "/dumbfuck"
+  ,.num_headers= 1
+  ,.headers=
+    { { "aaaaaaaaaaaaa",  "++++++++++" }
+    }
+  ,.body= ""
+  }
+
+#define FRAGMENT_IN_URI 3
+, {.name= "fragment in url"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /forums/1/topics/2375?page=1#posts-17408 HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "page=1"
+  ,.fragment= "posts-17408"
+  ,.request_path= "/forums/1/topics/2375"
+  /* XXX request url does include fragment? */
+  ,.request_url= "/forums/1/topics/2375?page=1#posts-17408"
+  ,.num_headers= 0
+  ,.body= ""
+  }
+
+#define GET_NO_HEADERS_NO_BODY 4
+, {.name= "get no headers no body"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /get_no_headers_no_body/world HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE /* would need Connection: close */
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/get_no_headers_no_body/world"
+  ,.request_url= "/get_no_headers_no_body/world"
+  ,.num_headers= 0
+  ,.body= ""
+  }
+
+#define GET_ONE_HEADER_NO_BODY 5
+, {.name= "get one header no body"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /get_one_header_no_body HTTP/1.1\r\n"
+         "Accept: */*\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE /* would need Connection: close */
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/get_one_header_no_body"
+  ,.request_url= "/get_one_header_no_body"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Accept" , "*/*" }
+    }
+  ,.body= ""
+  }
+
+#define GET_FUNKY_CONTENT_LENGTH 6
+, {.name= "get funky content length body hello"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /get_funky_content_length_body_hello HTTP/1.0\r\n"
+         "conTENT-Length: 5\r\n"
+         "\r\n"
+         "HELLO"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/get_funky_content_length_body_hello"
+  ,.request_url= "/get_funky_content_length_body_hello"
+  ,.num_headers= 1
+  ,.headers=
+    { { "conTENT-Length" , "5" }
+    }
+  ,.body= "HELLO"
+  }
+
+#define POST_IDENTITY_BODY_WORLD 7
+, {.name= "post identity body world"
+  ,.type= HTTP_REQUEST
+  ,.raw= "POST /post_identity_body_world?q=search#hey HTTP/1.1\r\n"
+         "Accept: */*\r\n"
+         "Transfer-Encoding: identity\r\n"
+         "Content-Length: 5\r\n"
+         "\r\n"
+         "World"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.query_string= "q=search"
+  ,.fragment= "hey"
+  ,.request_path= "/post_identity_body_world"
+  ,.request_url= "/post_identity_body_world?q=search#hey"
+  ,.num_headers= 3
+  ,.headers=
+    { { "Accept", "*/*" }
+    , { "Transfer-Encoding", "identity" }
+    , { "Content-Length", "5" }
+    }
+  ,.body= "World"
+  }
+
+#define POST_CHUNKED_ALL_YOUR_BASE 8
+, {.name= "post - chunked body: all your base are belong to us"
+  ,.type= HTTP_REQUEST
+  ,.raw= "POST /post_chunked_all_your_base HTTP/1.1\r\n"
+         "Transfer-Encoding: chunked\r\n"
+         "\r\n"
+         "1e\r\nall your base are belong to us\r\n"
+         "0\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/post_chunked_all_your_base"
+  ,.request_url= "/post_chunked_all_your_base"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Transfer-Encoding" , "chunked" }
+    }
+  ,.body= "all your base are belong to us"
+  ,.num_chunks_complete= 2
+  ,.chunk_lengths= { 0x1e }
+  }
+
+#define TWO_CHUNKS_MULT_ZERO_END 9
+, {.name= "two chunks ; triple zero ending"
+  ,.type= HTTP_REQUEST
+  ,.raw= "POST /two_chunks_mult_zero_end HTTP/1.1\r\n"
+         "Transfer-Encoding: chunked\r\n"
+         "\r\n"
+         "5\r\nhello\r\n"
+         "6\r\n world\r\n"
+         "000\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/two_chunks_mult_zero_end"
+  ,.request_url= "/two_chunks_mult_zero_end"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Transfer-Encoding", "chunked" }
+    }
+  ,.body= "hello world"
+  ,.num_chunks_complete= 3
+  ,.chunk_lengths= { 5, 6 }
+  }
+
+#define CHUNKED_W_TRAILING_HEADERS 10
+, {.name= "chunked with trailing headers. blech."
+  ,.type= HTTP_REQUEST
+  ,.raw= "POST /chunked_w_trailing_headers HTTP/1.1\r\n"
+         "Transfer-Encoding: chunked\r\n"
+         "\r\n"
+         "5\r\nhello\r\n"
+         "6\r\n world\r\n"
+         "0\r\n"
+         "Vary: *\r\n"
+         "Content-Type: text/plain\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/chunked_w_trailing_headers"
+  ,.request_url= "/chunked_w_trailing_headers"
+  ,.num_headers= 3
+  ,.headers=
+    { { "Transfer-Encoding",  "chunked" }
+    , { "Vary", "*" }
+    , { "Content-Type", "text/plain" }
+    }
+  ,.body= "hello world"
+  ,.num_chunks_complete= 3
+  ,.chunk_lengths= { 5, 6 }
+  }
+
+#define CHUNKED_W_BULLSHIT_AFTER_LENGTH 11
+, {.name= "with bullshit after the length"
+  ,.type= HTTP_REQUEST
+  ,.raw= "POST /chunked_w_bullshit_after_length HTTP/1.1\r\n"
+         "Transfer-Encoding: chunked\r\n"
+         "\r\n"
+         "5; ihatew3;whatthefuck=aretheseparametersfor\r\nhello\r\n"
+         "6; blahblah; blah\r\n world\r\n"
+         "0\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/chunked_w_bullshit_after_length"
+  ,.request_url= "/chunked_w_bullshit_after_length"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Transfer-Encoding", "chunked" }
+    }
+  ,.body= "hello world"
+  ,.num_chunks_complete= 3
+  ,.chunk_lengths= { 5, 6 }
+  }
+
+#define WITH_QUOTES 12
+, {.name= "with quotes"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /with_\"stupid\"_quotes?foo=\"bar\" HTTP/1.1\r\n\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "foo=\"bar\""
+  ,.fragment= ""
+  ,.request_path= "/with_\"stupid\"_quotes"
+  ,.request_url= "/with_\"stupid\"_quotes?foo=\"bar\""
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define APACHEBENCH_GET 13
+/* The server receiving this request SHOULD NOT wait for EOF
+ * to know that content-length == 0.
+ * How to represent this in a unit test? message_complete_on_eof
+ * Compare with NO_CONTENT_LENGTH_RESPONSE.
+ */
+, {.name = "apachebench get"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /test HTTP/1.0\r\n"
+         "Host: 0.0.0.0:5000\r\n"
+         "User-Agent: ApacheBench/2.3\r\n"
+         "Accept: */*\r\n\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/test"
+  ,.request_url= "/test"
+  ,.num_headers= 3
+  ,.headers= { { "Host", "0.0.0.0:5000" }
+             , { "User-Agent", "ApacheBench/2.3" }
+             , { "Accept", "*/*" }
+             }
+  ,.body= ""
+  }
+
+#define QUERY_URL_WITH_QUESTION_MARK_GET 14
+/* Some clients include '?' characters in query strings.
+ */
+, {.name = "query url with question mark"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /test.cgi?foo=bar?baz HTTP/1.1\r\n\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "foo=bar?baz"
+  ,.fragment= ""
+  ,.request_path= "/test.cgi"
+  ,.request_url= "/test.cgi?foo=bar?baz"
+  ,.num_headers= 0
+  ,.headers= {}
+  ,.body= ""
+  }
+
+#define PREFIX_NEWLINE_GET 15
+/* Some clients, especially after a POST in a keep-alive connection,
+ * will send an extra CRLF before the next request
+ */
+, {.name = "newline prefix get"
+  ,.type= HTTP_REQUEST
+  ,.raw= "\r\nGET /test HTTP/1.1\r\n\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/test"
+  ,.request_url= "/test"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define UPGRADE_REQUEST 16
+, {.name = "upgrade request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /demo HTTP/1.1\r\n"
+         "Host: example.com\r\n"
+         "Connection: Upgrade\r\n"
+         "Sec-WebSocket-Key2: 12998 5 Y3 1  .P00\r\n"
+         "Sec-WebSocket-Protocol: sample\r\n"
+         "Upgrade: WebSocket\r\n"
+         "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
+         "Origin: http://example.com\r\n"
+         "\r\n"
+         "Hot diggity dogg"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/demo"
+  ,.request_url= "/demo"
+  ,.num_headers= 7
+  ,.upgrade="Hot diggity dogg"
+  ,.headers= { { "Host", "example.com" }
+             , { "Connection", "Upgrade" }
+             , { "Sec-WebSocket-Key2", "12998 5 Y3 1  .P00" }
+             , { "Sec-WebSocket-Protocol", "sample" }
+             , { "Upgrade", "WebSocket" }
+             , { "Sec-WebSocket-Key1", "4 @1  46546xW%0l 1 5" }
+             , { "Origin", "http://example.com" }
+             }
+  ,.body= ""
+  }
+
+#define CONNECT_REQUEST 17
+, {.name = "connect request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "CONNECT 0-home0.netscape.com:443 HTTP/1.0\r\n"
+         "User-agent: Mozilla/1.1N\r\n"
+         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
+         "\r\n"
+         "some data\r\n"
+         "and yet even more data"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_CONNECT
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "0-home0.netscape.com:443"
+  ,.num_headers= 2
+  ,.upgrade="some data\r\nand yet even more data"
+  ,.headers= { { "User-agent", "Mozilla/1.1N" }
+             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
+             }
+  ,.body= ""
+  }
+
+#define REPORT_REQ 18
+, {.name= "report request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "REPORT /test HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_REPORT
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/test"
+  ,.request_url= "/test"
+  ,.num_headers= 0
+  ,.headers= {}
+  ,.body= ""
+  }
+
+#define NO_HTTP_VERSION 19
+, {.name= "request with no http version"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 0
+  ,.http_minor= 9
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/"
+  ,.request_url= "/"
+  ,.num_headers= 0
+  ,.headers= {}
+  ,.body= ""
+  }
+
+#define MSEARCH_REQ 20
+, {.name= "m-search request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "M-SEARCH * HTTP/1.1\r\n"
+         "HOST: 239.255.255.250:1900\r\n"
+         "MAN: \"ssdp:discover\"\r\n"
+         "ST: \"ssdp:all\"\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_MSEARCH
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "*"
+  ,.request_url= "*"
+  ,.num_headers= 3
+  ,.headers= { { "HOST", "239.255.255.250:1900" }
+             , { "MAN", "\"ssdp:discover\"" }
+             , { "ST", "\"ssdp:all\"" }
+             }
+  ,.body= ""
+  }
+
+#define LINE_FOLDING_IN_HEADER 21
+, {.name= "line folding in header value"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET / HTTP/1.1\r\n"
+         "Line1:   abc\r\n"
+         "\tdef\r\n"
+         " ghi\r\n"
+         "\t\tjkl\r\n"
+         "  mno \r\n"
+         "\t \tqrs\r\n"
+         "Line2: \t line2\t\r\n"
+         "Line3:\r\n"
+         " line3\r\n"
+         "Line4: \r\n"
+         " \r\n"
+         "Connection:\r\n"
+         " close\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/"
+  ,.request_url= "/"
+  ,.num_headers= 5
+  ,.headers= { { "Line1", "abc\tdef ghi\t\tjkl  mno \t \tqrs" }
+             , { "Line2", "line2\t" }
+             , { "Line3", "line3" }
+             , { "Line4", "" }
+             , { "Connection", "close" },
+             }
+  ,.body= ""
+  }
+
+
+#define QUERY_TERMINATED_HOST 22
+, {.name= "host terminated by a query string"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org?hail=all HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "hail=all"
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "http://hypnotoad.org?hail=all"
+  ,.host= "hypnotoad.org"
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define QUERY_TERMINATED_HOSTPORT 23
+, {.name= "host:port terminated by a query string"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org:1234?hail=all HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "hail=all"
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "http://hypnotoad.org:1234?hail=all"
+  ,.host= "hypnotoad.org"
+  ,.port= 1234
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define SPACE_TERMINATED_HOSTPORT 24
+, {.name= "host:port terminated by a space"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://hypnotoad.org:1234 HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "http://hypnotoad.org:1234"
+  ,.host= "hypnotoad.org"
+  ,.port= 1234
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define PATCH_REQ 25
+, {.name = "PATCH request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "PATCH /file.txt HTTP/1.1\r\n"
+         "Host: www.example.com\r\n"
+         "Content-Type: application/example\r\n"
+         "If-Match: \"e0023aa4e\"\r\n"
+         "Content-Length: 10\r\n"
+         "\r\n"
+         "cccccccccc"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_PATCH
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/file.txt"
+  ,.request_url= "/file.txt"
+  ,.num_headers= 4
+  ,.headers= { { "Host", "www.example.com" }
+             , { "Content-Type", "application/example" }
+             , { "If-Match", "\"e0023aa4e\"" }
+             , { "Content-Length", "10" }
+             }
+  ,.body= "cccccccccc"
+  }
+
+#define CONNECT_CAPS_REQUEST 26
+, {.name = "connect caps request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "CONNECT HOME0.NETSCAPE.COM:443 HTTP/1.0\r\n"
+         "User-agent: Mozilla/1.1N\r\n"
+         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_CONNECT
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "HOME0.NETSCAPE.COM:443"
+  ,.num_headers= 2
+  ,.upgrade=""
+  ,.headers= { { "User-agent", "Mozilla/1.1N" }
+             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
+             }
+  ,.body= ""
+  }
+
+#if !HTTP_PARSER_STRICT
+#define UTF8_PATH_REQ 27
+, {.name= "utf-8 path request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /δ¶/δt/pope?q=1#narf HTTP/1.1\r\n"
+         "Host: github.com\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= "q=1"
+  ,.fragment= "narf"
+  ,.request_path= "/δ¶/δt/pope"
+  ,.request_url= "/δ¶/δt/pope?q=1#narf"
+  ,.num_headers= 1
+  ,.headers= { {"Host", "github.com" }
+             }
+  ,.body= ""
+  }
+
+#define HOSTNAME_UNDERSCORE 28
+, {.name = "hostname underscore"
+  ,.type= HTTP_REQUEST
+  ,.raw= "CONNECT home_0.netscape.com:443 HTTP/1.0\r\n"
+         "User-agent: Mozilla/1.1N\r\n"
+         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_CONNECT
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= ""
+  ,.request_url= "home_0.netscape.com:443"
+  ,.num_headers= 2
+  ,.upgrade=""
+  ,.headers= { { "User-agent", "Mozilla/1.1N" }
+             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
+             }
+  ,.body= ""
+  }
+#endif  /* !HTTP_PARSER_STRICT */
+
+/* see https://github.com/ry/http-parser/issues/47 */
+#define EAT_TRAILING_CRLF_NO_CONNECTION_CLOSE 29
+, {.name = "eat CRLF between requests, no \"Connection: close\" header"
+  ,.raw= "POST / HTTP/1.1\r\n"
+         "Host: www.example.com\r\n"
+         "Content-Type: application/x-www-form-urlencoded\r\n"
+         "Content-Length: 4\r\n"
+         "\r\n"
+         "q=42\r\n" /* note the trailing CRLF */
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/"
+  ,.request_url= "/"
+  ,.num_headers= 3
+  ,.upgrade= 0
+  ,.headers= { { "Host", "www.example.com" }
+             , { "Content-Type", "application/x-www-form-urlencoded" }
+             , { "Content-Length", "4" }
+             }
+  ,.body= "q=42"
+  }
+
+/* see https://github.com/ry/http-parser/issues/47 */
+#define EAT_TRAILING_CRLF_WITH_CONNECTION_CLOSE 30
+, {.name = "eat CRLF between requests even if \"Connection: close\" is set"
+  ,.raw= "POST / HTTP/1.1\r\n"
+         "Host: www.example.com\r\n"
+         "Content-Type: application/x-www-form-urlencoded\r\n"
+         "Content-Length: 4\r\n"
+         "Connection: close\r\n"
+         "\r\n"
+         "q=42\r\n" /* note the trailing CRLF */
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE /* input buffer isn't empty when on_message_complete is called */
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/"
+  ,.request_url= "/"
+  ,.num_headers= 4
+  ,.upgrade= 0
+  ,.headers= { { "Host", "www.example.com" }
+             , { "Content-Type", "application/x-www-form-urlencoded" }
+             , { "Content-Length", "4" }
+             , { "Connection", "close" }
+             }
+  ,.body= "q=42"
+  }
+
+#define PURGE_REQ 31
+, {.name = "PURGE request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "PURGE /file.txt HTTP/1.1\r\n"
+         "Host: www.example.com\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_PURGE
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/file.txt"
+  ,.request_url= "/file.txt"
+  ,.num_headers= 1
+  ,.headers= { { "Host", "www.example.com" } }
+  ,.body= ""
+  }
+
+#define SEARCH_REQ 32
+, {.name = "SEARCH request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "SEARCH / HTTP/1.1\r\n"
+         "Host: www.example.com\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_SEARCH
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/"
+  ,.request_url= "/"
+  ,.num_headers= 1
+  ,.headers= { { "Host", "www.example.com" } }
+  ,.body= ""
+  }
+
+#define PROXY_WITH_BASIC_AUTH 33
+, {.name= "host:port and basic_auth"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET http://a%12:b!&*$@hypnotoad.org:1234/toto HTTP/1.1\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.fragment= ""
+  ,.request_path= "/toto"
+  ,.request_url= "http://a%12:b!&*$@hypnotoad.org:1234/toto"
+  ,.host= "hypnotoad.org"
+  ,.userinfo= "a%12:b!&*$"
+  ,.port= 1234
+  ,.num_headers= 0
+  ,.headers= { }
+  ,.body= ""
+  }
+
+#define LINE_FOLDING_IN_HEADER_WITH_LF 34
+, {.name= "line folding in header value"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET / HTTP/1.1\n"
+         "Line1:   abc\n"
+         "\tdef\n"
+         " ghi\n"
+         "\t\tjkl\n"
+         "  mno \n"
+         "\t \tqrs\n"
+         "Line2: \t line2\t\n"
+         "Line3:\n"
+         " line3\n"
+         "Line4: \n"
+         " \n"
+         "Connection:\n"
+         " close\n"
+         "\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/"
+  ,.request_url= "/"
+  ,.num_headers= 5
+  ,.headers= { { "Line1", "abc\tdef ghi\t\tjkl  mno \t \tqrs" }
+             , { "Line2", "line2\t" }
+             , { "Line3", "line3" }
+             , { "Line4", "" }
+             , { "Connection", "close" },
+             }
+  ,.body= ""
+  }
+
+#define CONNECTION_MULTI 35
+, {.name = "multiple connection header values with folding"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /demo HTTP/1.1\r\n"
+         "Host: example.com\r\n"
+         "Connection: Something,\r\n"
+         " Upgrade, ,Keep-Alive\r\n"
+         "Sec-WebSocket-Key2: 12998 5 Y3 1  .P00\r\n"
+         "Sec-WebSocket-Protocol: sample\r\n"
+         "Upgrade: WebSocket\r\n"
+         "Sec-WebSocket-Key1: 4 @1  46546xW%0l 1 5\r\n"
+         "Origin: http://example.com\r\n"
+         "\r\n"
+         "Hot diggity dogg"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/demo"
+  ,.request_url= "/demo"
+  ,.num_headers= 7
+  ,.upgrade="Hot diggity dogg"
+  ,.headers= { { "Host", "example.com" }
+             , { "Connection", "Something, Upgrade, ,Keep-Alive" }
+             , { "Sec-WebSocket-Key2", "12998 5 Y3 1  .P00" }
+             , { "Sec-WebSocket-Protocol", "sample" }
+             , { "Upgrade", "WebSocket" }
+             , { "Sec-WebSocket-Key1", "4 @1  46546xW%0l 1 5" }
+             , { "Origin", "http://example.com" }
+             }
+  ,.body= ""
+  }
+
+#define CONNECTION_MULTI_LWS 36
+, {.name = "multiple connection header values with folding and lws"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /demo HTTP/1.1\r\n"
+         "Connection: keep-alive, upgrade\r\n"
+         "Upgrade: WebSocket\r\n"
+         "\r\n"
+         "Hot diggity dogg"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/demo"
+  ,.request_url= "/demo"
+  ,.num_headers= 2
+  ,.upgrade="Hot diggity dogg"
+  ,.headers= { { "Connection", "keep-alive, upgrade" }
+             , { "Upgrade", "WebSocket" }
+             }
+  ,.body= ""
+  }
+
+#define CONNECTION_MULTI_LWS_CRLF 37
+, {.name = "multiple connection header values with folding and lws"
+  ,.type= HTTP_REQUEST
+  ,.raw= "GET /demo HTTP/1.1\r\n"
+         "Connection: keep-alive, \r\n upgrade\r\n"
+         "Upgrade: WebSocket\r\n"
+         "\r\n"
+         "Hot diggity dogg"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_GET
+  ,.query_string= ""
+  ,.fragment= ""
+  ,.request_path= "/demo"
+  ,.request_url= "/demo"
+  ,.num_headers= 2
+  ,.upgrade="Hot diggity dogg"
+  ,.headers= { { "Connection", "keep-alive,  upgrade" }
+             , { "Upgrade", "WebSocket" }
+             }
+  ,.body= ""
+  }
+
+#define UPGRADE_POST_REQUEST 38
+, {.name = "upgrade post request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "POST /demo HTTP/1.1\r\n"
+         "Host: example.com\r\n"
+         "Connection: Upgrade\r\n"
+         "Upgrade: HTTP/2.0\r\n"
+         "Content-Length: 15\r\n"
+         "\r\n"
+         "sweet post body"
+         "Hot diggity dogg"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.method= HTTP_POST
+  ,.request_path= "/demo"
+  ,.request_url= "/demo"
+  ,.num_headers= 4
+  ,.upgrade="Hot diggity dogg"
+  ,.headers= { { "Host", "example.com" }
+             , { "Connection", "Upgrade" }
+             , { "Upgrade", "HTTP/2.0" }
+             , { "Content-Length", "15" }
+             }
+  ,.body= "sweet post body"
+  }
+
+#define CONNECT_WITH_BODY_REQUEST 39
+, {.name = "connect with body request"
+  ,.type= HTTP_REQUEST
+  ,.raw= "CONNECT foo.bar.com:443 HTTP/1.0\r\n"
+         "User-agent: Mozilla/1.1N\r\n"
+         "Proxy-authorization: basic aGVsbG86d29ybGQ=\r\n"
+         "Content-Length: 10\r\n"
+         "\r\n"
+         "blarfcicle"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.method= HTTP_CONNECT
+  ,.request_url= "foo.bar.com:443"
+  ,.num_headers= 3
+  ,.upgrade="blarfcicle"
+  ,.headers= { { "User-agent", "Mozilla/1.1N" }
+             , { "Proxy-authorization", "basic aGVsbG86d29ybGQ=" }
+             , { "Content-Length", "10" }
+             }
+  ,.body= ""
+  }
+
+, {.name= NULL } /* sentinel */
+};
+
+/* * R E S P O N S E S * */
+const struct message responses[] =
+#define GOOGLE_301 0
+{ {.name= "google 301"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 301 Moved Permanently\r\n"
+         "Location: http://www.google.com/\r\n"
+         "Content-Type: text/html; charset=UTF-8\r\n"
+         "Date: Sun, 26 Apr 2009 11:11:49 GMT\r\n"
+         "Expires: Tue, 26 May 2009 11:11:49 GMT\r\n"
+         "X-$PrototypeBI-Version: 1.6.0.3\r\n" /* $ char in header field */
+         "Cache-Control: public, max-age=2592000\r\n"
+         "Server: gws\r\n"
+         "Content-Length:  219  \r\n"
+         "\r\n"
+         "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n"
+         "<TITLE>301 Moved</TITLE></HEAD><BODY>\n"
+         "<H1>301 Moved</H1>\n"
+         "The document has moved\n"
+         "<A HREF=\"http://www.google.com/\">here</A>.\r\n"
+         "</BODY></HTML>\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 301
+  ,.response_status= "Moved Permanently"
+  ,.num_headers= 8
+  ,.headers=
+    { { "Location", "http://www.google.com/" }
+    , { "Content-Type", "text/html; charset=UTF-8" }
+    , { "Date", "Sun, 26 Apr 2009 11:11:49 GMT" }
+    , { "Expires", "Tue, 26 May 2009 11:11:49 GMT" }
+    , { "X-$PrototypeBI-Version", "1.6.0.3" }
+    , { "Cache-Control", "public, max-age=2592000" }
+    , { "Server", "gws" }
+    , { "Content-Length", "219  " }
+    }
+  ,.body= "<HTML><HEAD><meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n"
+          "<TITLE>301 Moved</TITLE></HEAD><BODY>\n"
+          "<H1>301 Moved</H1>\n"
+          "The document has moved\n"
+          "<A HREF=\"http://www.google.com/\">here</A>.\r\n"
+          "</BODY></HTML>\r\n"
+  }
+
+#define NO_CONTENT_LENGTH_RESPONSE 1
+/* The client should wait for the server's EOF. That is, when content-length
+ * is not specified, and "Connection: close", the end of body is specified
+ * by the EOF.
+ * Compare with APACHEBENCH_GET
+ */
+, {.name= "no content-length response"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Date: Tue, 04 Aug 2009 07:59:32 GMT\r\n"
+         "Server: Apache\r\n"
+         "X-Powered-By: Servlet/2.5 JSP/2.1\r\n"
+         "Content-Type: text/xml; charset=utf-8\r\n"
+         "Connection: close\r\n"
+         "\r\n"
+         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+         "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
+         "  <SOAP-ENV:Body>\n"
+         "    <SOAP-ENV:Fault>\n"
+         "       <faultcode>SOAP-ENV:Client</faultcode>\n"
+         "       <faultstring>Client Error</faultstring>\n"
+         "    </SOAP-ENV:Fault>\n"
+         "  </SOAP-ENV:Body>\n"
+         "</SOAP-ENV:Envelope>"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 5
+  ,.headers=
+    { { "Date", "Tue, 04 Aug 2009 07:59:32 GMT" }
+    , { "Server", "Apache" }
+    , { "X-Powered-By", "Servlet/2.5 JSP/2.1" }
+    , { "Content-Type", "text/xml; charset=utf-8" }
+    , { "Connection", "close" }
+    }
+  ,.body= "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+          "<SOAP-ENV:Envelope xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\">\n"
+          "  <SOAP-ENV:Body>\n"
+          "    <SOAP-ENV:Fault>\n"
+          "       <faultcode>SOAP-ENV:Client</faultcode>\n"
+          "       <faultstring>Client Error</faultstring>\n"
+          "    </SOAP-ENV:Fault>\n"
+          "  </SOAP-ENV:Body>\n"
+          "</SOAP-ENV:Envelope>"
+  }
+
+#define NO_HEADERS_NO_BODY_404 2
+, {.name= "404 no headers no body"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 404 Not Found\r\n\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 404
+  ,.response_status= "Not Found"
+  ,.num_headers= 0
+  ,.headers= {}
+  ,.body_size= 0
+  ,.body= ""
+  }
+
+#define NO_REASON_PHRASE 3
+, {.name= "301 no response phrase"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 301\r\n\r\n"
+  ,.should_keep_alive = FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 301
+  ,.response_status= ""
+  ,.num_headers= 0
+  ,.headers= {}
+  ,.body= ""
+  }
+
+#define TRAILING_SPACE_ON_CHUNKED_BODY 4
+, {.name="200 trailing space on chunked body"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Content-Type: text/plain\r\n"
+         "Transfer-Encoding: chunked\r\n"
+         "\r\n"
+         "25  \r\n"
+         "This is the data in the first chunk\r\n"
+         "\r\n"
+         "1C\r\n"
+         "and this is the second one\r\n"
+         "\r\n"
+         "0  \r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 2
+  ,.headers=
+    { {"Content-Type", "text/plain" }
+    , {"Transfer-Encoding", "chunked" }
+    }
+  ,.body_size = 37+28
+  ,.body =
+         "This is the data in the first chunk\r\n"
+         "and this is the second one\r\n"
+  ,.num_chunks_complete= 3
+  ,.chunk_lengths= { 0x25, 0x1c }
+  }
+
+#define NO_CARRIAGE_RET 5
+, {.name="no carriage ret"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\n"
+         "Content-Type: text/html; charset=utf-8\n"
+         "Connection: close\n"
+         "\n"
+         "these headers are from http://news.ycombinator.com/"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 2
+  ,.headers=
+    { {"Content-Type", "text/html; charset=utf-8" }
+    , {"Connection", "close" }
+    }
+  ,.body= "these headers are from http://news.ycombinator.com/"
+  }
+
+#define PROXY_CONNECTION 6
+, {.name="proxy connection"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Content-Type: text/html; charset=UTF-8\r\n"
+         "Content-Length: 11\r\n"
+         "Proxy-Connection: close\r\n"
+         "Date: Thu, 31 Dec 2009 20:55:48 +0000\r\n"
+         "\r\n"
+         "hello world"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 4
+  ,.headers=
+    { {"Content-Type", "text/html; charset=UTF-8" }
+    , {"Content-Length", "11" }
+    , {"Proxy-Connection", "close" }
+    , {"Date", "Thu, 31 Dec 2009 20:55:48 +0000"}
+    }
+  ,.body= "hello world"
+  }
+
+#define UNDERSTORE_HEADER_KEY 7
+  // shown by
+  // curl -o /dev/null -v "http://ad.doubleclick.net/pfadx/DARTSHELLCONFIGXML;dcmt=text/xml;"
+, {.name="underscore header key"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Server: DCLK-AdSvr\r\n"
+         "Content-Type: text/xml\r\n"
+         "Content-Length: 0\r\n"
+         "DCLK_imp: v7;x;114750856;0-0;0;17820020;0/0;21603567/21621457/1;;~okv=;dcmt=text/xml;;~cs=o\r\n\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 4
+  ,.headers=
+    { {"Server", "DCLK-AdSvr" }
+    , {"Content-Type", "text/xml" }
+    , {"Content-Length", "0" }
+    , {"DCLK_imp", "v7;x;114750856;0-0;0;17820020;0/0;21603567/21621457/1;;~okv=;dcmt=text/xml;;~cs=o" }
+    }
+  ,.body= ""
+  }
+
+#define BONJOUR_MADAME_FR 8
+/* The client should not merge two headers fields when the first one doesn't
+ * have a value.
+ */
+, {.name= "bonjourmadame.fr"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.0 301 Moved Permanently\r\n"
+         "Date: Thu, 03 Jun 2010 09:56:32 GMT\r\n"
+         "Server: Apache/2.2.3 (Red Hat)\r\n"
+         "Cache-Control: public\r\n"
+         "Pragma: \r\n"
+         "Location: http://www.bonjourmadame.fr/\r\n"
+         "Vary: Accept-Encoding\r\n"
+         "Content-Length: 0\r\n"
+         "Content-Type: text/html; charset=UTF-8\r\n"
+         "Connection: keep-alive\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.status_code= 301
+  ,.response_status= "Moved Permanently"
+  ,.num_headers= 9
+  ,.headers=
+    { { "Date", "Thu, 03 Jun 2010 09:56:32 GMT" }
+    , { "Server", "Apache/2.2.3 (Red Hat)" }
+    , { "Cache-Control", "public" }
+    , { "Pragma", "" }
+    , { "Location", "http://www.bonjourmadame.fr/" }
+    , { "Vary",  "Accept-Encoding" }
+    , { "Content-Length", "0" }
+    , { "Content-Type", "text/html; charset=UTF-8" }
+    , { "Connection", "keep-alive" }
+    }
+  ,.body= ""
+  }
+
+#define RES_FIELD_UNDERSCORE 9
+/* Should handle spaces in header fields */
+, {.name= "field underscore"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Date: Tue, 28 Sep 2010 01:14:13 GMT\r\n"
+         "Server: Apache\r\n"
+         "Cache-Control: no-cache, must-revalidate\r\n"
+         "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
+         ".et-Cookie: PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com\r\n"
+         "Vary: Accept-Encoding\r\n"
+         "_eep-Alive: timeout=45\r\n" /* semantic value ignored */
+         "_onnection: Keep-Alive\r\n" /* semantic value ignored */
+         "Transfer-Encoding: chunked\r\n"
+         "Content-Type: text/html\r\n"
+         "Connection: close\r\n"
+         "\r\n"
+         "0\r\n\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 11
+  ,.headers=
+    { { "Date", "Tue, 28 Sep 2010 01:14:13 GMT" }
+    , { "Server", "Apache" }
+    , { "Cache-Control", "no-cache, must-revalidate" }
+    , { "Expires", "Mon, 26 Jul 1997 05:00:00 GMT" }
+    , { ".et-Cookie", "PlaxoCS=1274804622353690521; path=/; domain=.plaxo.com" }
+    , { "Vary", "Accept-Encoding" }
+    , { "_eep-Alive", "timeout=45" }
+    , { "_onnection", "Keep-Alive" }
+    , { "Transfer-Encoding", "chunked" }
+    , { "Content-Type", "text/html" }
+    , { "Connection", "close" }
+    }
+  ,.body= ""
+  ,.num_chunks_complete= 1
+  ,.chunk_lengths= {}
+  }
+
+#define NON_ASCII_IN_STATUS_LINE 10
+/* Should handle non-ASCII in status line */
+, {.name= "non-ASCII in status line"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 500 Oriëntatieprobleem\r\n"
+         "Date: Fri, 5 Nov 2010 23:07:12 GMT+2\r\n"
+         "Content-Length: 0\r\n"
+         "Connection: close\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 500
+  ,.response_status= "Oriëntatieprobleem"
+  ,.num_headers= 3
+  ,.headers=
+    { { "Date", "Fri, 5 Nov 2010 23:07:12 GMT+2" }
+    , { "Content-Length", "0" }
+    , { "Connection", "close" }
+    }
+  ,.body= ""
+  }
+
+#define HTTP_VERSION_0_9 11
+/* Should handle HTTP/0.9 */
+, {.name= "http version 0.9"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/0.9 200 OK\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 0
+  ,.http_minor= 9
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 0
+  ,.headers=
+    {}
+  ,.body= ""
+  }
+
+#define NO_CONTENT_LENGTH_NO_TRANSFER_ENCODING_RESPONSE 12
+/* The client should wait for the server's EOF. That is, when neither
+ * content-length nor transfer-encoding is specified, the end of body
+ * is specified by the EOF.
+ */
+, {.name= "neither content-length nor transfer-encoding response"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Content-Type: text/plain\r\n"
+         "\r\n"
+         "hello world"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Content-Type", "text/plain" }
+    }
+  ,.body= "hello world"
+  }
+
+#define NO_BODY_HTTP10_KA_200 13
+, {.name= "HTTP/1.0 with keep-alive and EOF-terminated 200 status"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.0 200 OK\r\n"
+         "Connection: keep-alive\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Connection", "keep-alive" }
+    }
+  ,.body_size= 0
+  ,.body= ""
+  }
+
+#define NO_BODY_HTTP10_KA_204 14
+, {.name= "HTTP/1.0 with keep-alive and a 204 status"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.0 204 No content\r\n"
+         "Connection: keep-alive\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 0
+  ,.status_code= 204
+  ,.response_status= "No content"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Connection", "keep-alive" }
+    }
+  ,.body_size= 0
+  ,.body= ""
+  }
+
+#define NO_BODY_HTTP11_KA_200 15
+, {.name= "HTTP/1.1 with an EOF-terminated 200 status"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 0
+  ,.headers={}
+  ,.body_size= 0
+  ,.body= ""
+  }
+
+#define NO_BODY_HTTP11_KA_204 16
+, {.name= "HTTP/1.1 with a 204 status"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 204 No content\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 204
+  ,.response_status= "No content"
+  ,.num_headers= 0
+  ,.headers={}
+  ,.body_size= 0
+  ,.body= ""
+  }
+
+#define NO_BODY_HTTP11_NOKA_204 17
+, {.name= "HTTP/1.1 with a 204 status and keep-alive disabled"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 204 No content\r\n"
+         "Connection: close\r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 204
+  ,.response_status= "No content"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Connection", "close" }
+    }
+  ,.body_size= 0
+  ,.body= ""
+  }
+
+#define NO_BODY_HTTP11_KA_CHUNKED_200 18
+, {.name= "HTTP/1.1 with chunked endocing and a 200 response"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Transfer-Encoding: chunked\r\n"
+         "\r\n"
+         "0\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 1
+  ,.headers=
+    { { "Transfer-Encoding", "chunked" }
+    }
+  ,.body_size= 0
+  ,.body= ""
+  ,.num_chunks_complete= 1
+  }
+
+#if !HTTP_PARSER_STRICT
+#define SPACE_IN_FIELD_RES 19
+/* Should handle spaces in header fields */
+, {.name= "field space"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 OK\r\n"
+         "Server: Microsoft-IIS/6.0\r\n"
+         "X-Powered-By: ASP.NET\r\n"
+         "en-US Content-Type: text/xml\r\n" /* this is the problem */
+         "Content-Type: text/xml\r\n"
+         "Content-Length: 16\r\n"
+         "Date: Fri, 23 Jul 2010 18:45:38 GMT\r\n"
+         "Connection: keep-alive\r\n"
+         "\r\n"
+         "<xml>hello</xml>" /* fake body */
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= "OK"
+  ,.num_headers= 7
+  ,.headers=
+    { { "Server",  "Microsoft-IIS/6.0" }
+    , { "X-Powered-By", "ASP.NET" }
+    , { "en-US Content-Type", "text/xml" }
+    , { "Content-Type", "text/xml" }
+    , { "Content-Length", "16" }
+    , { "Date", "Fri, 23 Jul 2010 18:45:38 GMT" }
+    , { "Connection", "keep-alive" }
+    }
+  ,.body= "<xml>hello</xml>"
+  }
+#endif /* !HTTP_PARSER_STRICT */
+
+#define AMAZON_COM 20
+, {.name= "amazon.com"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 301 MovedPermanently\r\n"
+         "Date: Wed, 15 May 2013 17:06:33 GMT\r\n"
+         "Server: Server\r\n"
+         "x-amz-id-1: 0GPHKXSJQ826RK7GZEB2\r\n"
+         "p3p: policyref=\"http://www.amazon.com/w3c/p3p.xml\",CP=\"CAO DSP LAW CUR ADM IVAo IVDo CONo OTPo OUR DELi PUBi OTRi BUS PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA HEA PRE LOC GOV OTC \"\r\n"
+         "x-amz-id-2: STN69VZxIFSz9YJLbz1GDbxpbjG6Qjmmq5E3DxRhOUw+Et0p4hr7c/Q8qNcx4oAD\r\n"
+         "Location: http://www.amazon.com/Dan-Brown/e/B000AP9DSU/ref=s9_pop_gw_al1?_encoding=UTF8&refinementId=618073011&pf_rd_m=ATVPDKIKX0DER&pf_rd_s=center-2&pf_rd_r=0SHYY5BZXN3KR20BNFAY&pf_rd_t=101&pf_rd_p=1263340922&pf_rd_i=507846\r\n"
+         "Vary: Accept-Encoding,User-Agent\r\n"
+         "Content-Type: text/html; charset=ISO-8859-1\r\n"
+         "Transfer-Encoding: chunked\r\n"
+         "\r\n"
+         "1\r\n"
+         "\n\r\n"
+         "0\r\n"
+         "\r\n"
+  ,.should_keep_alive= TRUE
+  ,.message_complete_on_eof= FALSE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 301
+  ,.response_status= "MovedPermanently"
+  ,.num_headers= 9
+  ,.headers= { { "Date", "Wed, 15 May 2013 17:06:33 GMT" }
+             , { "Server", "Server" }
+             , { "x-amz-id-1", "0GPHKXSJQ826RK7GZEB2" }
+             , { "p3p", "policyref=\"http://www.amazon.com/w3c/p3p.xml\",CP=\"CAO DSP LAW CUR ADM IVAo IVDo CONo OTPo OUR DELi PUBi OTRi BUS PHY ONL UNI PUR FIN COM NAV INT DEM CNT STA HEA PRE LOC GOV OTC \"" }
+             , { "x-amz-id-2", "STN69VZxIFSz9YJLbz1GDbxpbjG6Qjmmq5E3DxRhOUw+Et0p4hr7c/Q8qNcx4oAD" }
+             , { "Location", "http://www.amazon.com/Dan-Brown/e/B000AP9DSU/ref=s9_pop_gw_al1?_encoding=UTF8&refinementId=618073011&pf_rd_m=ATVPDKIKX0DER&pf_rd_s=center-2&pf_rd_r=0SHYY5BZXN3KR20BNFAY&pf_rd_t=101&pf_rd_p=1263340922&pf_rd_i=507846" }
+             , { "Vary", "Accept-Encoding,User-Agent" }
+             , { "Content-Type", "text/html; charset=ISO-8859-1" }
+             , { "Transfer-Encoding", "chunked" }
+             }
+  ,.body= "\n"
+  ,.num_chunks_complete= 2
+  ,.chunk_lengths= { 1 }
+  }
+
+#define EMPTY_REASON_PHRASE_AFTER_SPACE 20
+, {.name= "empty reason phrase after space"
+  ,.type= HTTP_RESPONSE
+  ,.raw= "HTTP/1.1 200 \r\n"
+         "\r\n"
+  ,.should_keep_alive= FALSE
+  ,.message_complete_on_eof= TRUE
+  ,.http_major= 1
+  ,.http_minor= 1
+  ,.status_code= 200
+  ,.response_status= ""
+  ,.num_headers= 0
+  ,.headers= {}
+  ,.body= ""
+  }
+
+, {.name= NULL } /* sentinel */
+};
+
+/* strnlen() is a POSIX.2008 addition. Can't rely on it being available so
+ * define it ourselves.
+ */
+size_t
+strnlen(const char *s, size_t maxlen)
+{
+  const char *p;
+
+  p = memchr(s, '\0', maxlen);
+  if (p == NULL)
+    return maxlen;
+
+  return p - s;
+}
+
+size_t
+strlncat(char *dst, size_t len, const char *src, size_t n)
+{
+  size_t slen;
+  size_t dlen;
+  size_t rlen;
+  size_t ncpy;
+
+  slen = strnlen(src, n);
+  dlen = strnlen(dst, len);
+
+  if (dlen < len) {
+    rlen = len - dlen;
+    ncpy = slen < rlen ? slen : (rlen - 1);
+    memcpy(dst + dlen, src, ncpy);
+    dst[dlen + ncpy] = '\0';
+  }
+
+  assert(len > slen + dlen);
+  return slen + dlen;
+}
+
+size_t
+strlcat(char *dst, const char *src, size_t len)
+{
+  return strlncat(dst, len, src, (size_t) -1);
+}
+
+size_t
+strlncpy(char *dst, size_t len, const char *src, size_t n)
+{
+  size_t slen;
+  size_t ncpy;
+
+  slen = strnlen(src, n);
+
+  if (len > 0) {
+    ncpy = slen < len ? slen : (len - 1);
+    memcpy(dst, src, ncpy);
+    dst[ncpy] = '\0';
+  }
+
+  assert(len > slen);
+  return slen;
+}
+
+size_t
+strlcpy(char *dst, const char *src, size_t len)
+{
+  return strlncpy(dst, len, src, (size_t) -1);
+}
+
+int
+request_url_cb (http_parser *p, const char *buf, size_t len)
+{
+  assert(p == parser);
+  strlncat(messages[num_messages].request_url,
+           sizeof(messages[num_messages].request_url),
+           buf,
+           len);
+  return 0;
+}
+
+int
+header_field_cb (http_parser *p, const char *buf, size_t len)
+{
+  assert(p == parser);
+  struct message *m = &messages[num_messages];
+
+  if (m->last_header_element != FIELD)
+    m->num_headers++;
+
+  strlncat(m->headers[m->num_headers-1][0],
+           sizeof(m->headers[m->num_headers-1][0]),
+           buf,
+           len);
+
+  m->last_header_element = FIELD;
+
+  return 0;
+}
+
+int
+header_value_cb (http_parser *p, const char *buf, size_t len)
+{
+  assert(p == parser);
+  struct message *m = &messages[num_messages];
+
+  strlncat(m->headers[m->num_headers-1][1],
+           sizeof(m->headers[m->num_headers-1][1]),
+           buf,
+           len);
+
+  m->last_header_element = VALUE;
+
+  return 0;
+}
+
+void
+check_body_is_final (const http_parser *p)
+{
+  if (messages[num_messages].body_is_final) {
+    fprintf(stderr, "\n\n *** Error http_body_is_final() should return 1 "
+                    "on last on_body callback call "
+                    "but it doesn't! ***\n\n");
+    assert(0);
+    abort();
+  }
+  messages[num_messages].body_is_final = http_body_is_final(p);
+}
+
+int
+body_cb (http_parser *p, const char *buf, size_t len)
+{
+  assert(p == parser);
+  strlncat(messages[num_messages].body,
+           sizeof(messages[num_messages].body),
+           buf,
+           len);
+  messages[num_messages].body_size += len;
+  check_body_is_final(p);
+ // printf("body_cb: '%s'\n", requests[num_messages].body);
+  return 0;
+}
+
+int
+count_body_cb (http_parser *p, const char *buf, size_t len)
+{
+  assert(p == parser);
+  assert(buf);
+  messages[num_messages].body_size += len;
+  check_body_is_final(p);
+  return 0;
+}
+
+int
+message_begin_cb (http_parser *p)
+{
+  assert(p == parser);
+  messages[num_messages].message_begin_cb_called = TRUE;
+  return 0;
+}
+
+int
+headers_complete_cb (http_parser *p)
+{
+  assert(p == parser);
+  messages[num_messages].method = parser->method;
+  messages[num_messages].status_code = parser->status_code;
+  messages[num_messages].http_major = parser->http_major;
+  messages[num_messages].http_minor = parser->http_minor;
+  messages[num_messages].headers_complete_cb_called = TRUE;
+  messages[num_messages].should_keep_alive = http_should_keep_alive(parser);
+  return 0;
+}
+
+int
+message_complete_cb (http_parser *p)
+{
+  assert(p == parser);
+  if (messages[num_messages].should_keep_alive != http_should_keep_alive(parser))
+  {
+    fprintf(stderr, "\n\n *** Error http_should_keep_alive() should have same "
+                    "value in both on_message_complete and on_headers_complete "
+                    "but it doesn't! ***\n\n");
+    assert(0);
+    abort();
+  }
+
+  if (messages[num_messages].body_size &&
+      http_body_is_final(p) &&
+      !messages[num_messages].body_is_final)
+  {
+    fprintf(stderr, "\n\n *** Error http_body_is_final() should return 1 "
+                    "on last on_body callback call "
+                    "but it doesn't! ***\n\n");
+    assert(0);
+    abort();
+  }
+
+  messages[num_messages].message_complete_cb_called = TRUE;
+
+  messages[num_messages].message_complete_on_eof = currently_parsing_eof;
+
+  num_messages++;
+  return 0;
+}
+
+int
+response_status_cb (http_parser *p, const char *buf, size_t len)
+{
+  assert(p == parser);
+  strlncat(messages[num_messages].response_status,
+           sizeof(messages[num_messages].response_status),
+           buf,
+           len);
+  return 0;
+}
+
+int
+chunk_header_cb (http_parser *p)
+{
+  assert(p == parser);
+  int chunk_idx = messages[num_messages].num_chunks;
+  messages[num_messages].num_chunks++;
+  if (chunk_idx < MAX_CHUNKS) {
+    messages[num_messages].chunk_lengths[chunk_idx] = p->content_length;
+  }
+
+  return 0;
+}
+
+int
+chunk_complete_cb (http_parser *p)
+{
+  assert(p == parser);
+
+  /* Here we want to verify that each chunk_header_cb is matched by a
+   * chunk_complete_cb, so not only should the total number of calls to
+   * both callbacks be the same, but they also should be interleaved
+   * properly */
+  assert(messages[num_messages].num_chunks ==
+         messages[num_messages].num_chunks_complete + 1);
+
+  messages[num_messages].num_chunks_complete++;
+  return 0;
+}
+
+/* These dontcall_* callbacks exist so that we can verify that when we're
+ * paused, no additional callbacks are invoked */
+int
+dontcall_message_begin_cb (http_parser *p)
+{
+  if (p) { } // gcc
+  fprintf(stderr, "\n\n*** on_message_begin() called on paused parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_header_field_cb (http_parser *p, const char *buf, size_t len)
+{
+  if (p || buf || len) { } // gcc
+  fprintf(stderr, "\n\n*** on_header_field() called on paused parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_header_value_cb (http_parser *p, const char *buf, size_t len)
+{
+  if (p || buf || len) { } // gcc
+  fprintf(stderr, "\n\n*** on_header_value() called on paused parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_request_url_cb (http_parser *p, const char *buf, size_t len)
+{
+  if (p || buf || len) { } // gcc
+  fprintf(stderr, "\n\n*** on_request_url() called on paused parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_body_cb (http_parser *p, const char *buf, size_t len)
+{
+  if (p || buf || len) { } // gcc
+  fprintf(stderr, "\n\n*** on_body_cb() called on paused parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_headers_complete_cb (http_parser *p)
+{
+  if (p) { } // gcc
+  fprintf(stderr, "\n\n*** on_headers_complete() called on paused "
+                  "parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_message_complete_cb (http_parser *p)
+{
+  if (p) { } // gcc
+  fprintf(stderr, "\n\n*** on_message_complete() called on paused "
+                  "parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_response_status_cb (http_parser *p, const char *buf, size_t len)
+{
+  if (p || buf || len) { } // gcc
+  fprintf(stderr, "\n\n*** on_status() called on paused parser ***\n\n");
+  abort();
+}
+
+int
+dontcall_chunk_header_cb (http_parser *p)
+{
+  if (p) { } // gcc
+  fprintf(stderr, "\n\n*** on_chunk_header() called on paused parser ***\n\n");
+  exit(1);
+}
+
+int
+dontcall_chunk_complete_cb (http_parser *p)
+{
+  if (p) { } // gcc
+  fprintf(stderr, "\n\n*** on_chunk_complete() "
+          "called on paused parser ***\n\n");
+  exit(1);
+}
+
+static http_parser_settings settings_dontcall =
+  {.on_message_begin = dontcall_message_begin_cb
+  ,.on_header_field = dontcall_header_field_cb
+  ,.on_header_value = dontcall_header_value_cb
+  ,.on_url = dontcall_request_url_cb
+  ,.on_status = dontcall_response_status_cb
+  ,.on_body = dontcall_body_cb
+  ,.on_headers_complete = dontcall_headers_complete_cb
+  ,.on_message_complete = dontcall_message_complete_cb
+  ,.on_chunk_header = dontcall_chunk_header_cb
+  ,.on_chunk_complete = dontcall_chunk_complete_cb
+  };
+
+/* These pause_* callbacks always pause the parser and just invoke the regular
+ * callback that tracks content. Before returning, we overwrite the parser
+ * settings to point to the _dontcall variety so that we can verify that
+ * the pause actually did, you know, pause. */
+int
+pause_message_begin_cb (http_parser *p)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return message_begin_cb(p);
+}
+
+int
+pause_header_field_cb (http_parser *p, const char *buf, size_t len)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return header_field_cb(p, buf, len);
+}
+
+int
+pause_header_value_cb (http_parser *p, const char *buf, size_t len)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return header_value_cb(p, buf, len);
+}
+
+int
+pause_request_url_cb (http_parser *p, const char *buf, size_t len)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return request_url_cb(p, buf, len);
+}
+
+int
+pause_body_cb (http_parser *p, const char *buf, size_t len)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return body_cb(p, buf, len);
+}
+
+int
+pause_headers_complete_cb (http_parser *p)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return headers_complete_cb(p);
+}
+
+int
+pause_message_complete_cb (http_parser *p)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return message_complete_cb(p);
+}
+
+int
+pause_response_status_cb (http_parser *p, const char *buf, size_t len)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return response_status_cb(p, buf, len);
+}
+
+int
+pause_chunk_header_cb (http_parser *p)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return chunk_header_cb(p);
+}
+
+int
+pause_chunk_complete_cb (http_parser *p)
+{
+  http_parser_pause(p, 1);
+  *current_pause_parser = settings_dontcall;
+  return chunk_complete_cb(p);
+}
+
+static http_parser_settings settings_pause =
+  {.on_message_begin = pause_message_begin_cb
+  ,.on_header_field = pause_header_field_cb
+  ,.on_header_value = pause_header_value_cb
+  ,.on_url = pause_request_url_cb
+  ,.on_status = pause_response_status_cb
+  ,.on_body = pause_body_cb
+  ,.on_headers_complete = pause_headers_complete_cb
+  ,.on_message_complete = pause_message_complete_cb
+  ,.on_chunk_header = pause_chunk_header_cb
+  ,.on_chunk_complete = pause_chunk_complete_cb
+  };
+
+static http_parser_settings settings =
+  {.on_message_begin = message_begin_cb
+  ,.on_header_field = header_field_cb
+  ,.on_header_value = header_value_cb
+  ,.on_url = request_url_cb
+  ,.on_status = response_status_cb
+  ,.on_body = body_cb
+  ,.on_headers_complete = headers_complete_cb
+  ,.on_message_complete = message_complete_cb
+  ,.on_chunk_header = chunk_header_cb
+  ,.on_chunk_complete = chunk_complete_cb
+  };
+
+static http_parser_settings settings_count_body =
+  {.on_message_begin = message_begin_cb
+  ,.on_header_field = header_field_cb
+  ,.on_header_value = header_value_cb
+  ,.on_url = request_url_cb
+  ,.on_status = response_status_cb
+  ,.on_body = count_body_cb
+  ,.on_headers_complete = headers_complete_cb
+  ,.on_message_complete = message_complete_cb
+  ,.on_chunk_header = chunk_header_cb
+  ,.on_chunk_complete = chunk_complete_cb
+  };
+
+static http_parser_settings settings_null =
+  {.on_message_begin = 0
+  ,.on_header_field = 0
+  ,.on_header_value = 0
+  ,.on_url = 0
+  ,.on_status = 0
+  ,.on_body = 0
+  ,.on_headers_complete = 0
+  ,.on_message_complete = 0
+  ,.on_chunk_header = 0
+  ,.on_chunk_complete = 0
+  };
+
+void
+parser_init (enum http_parser_type type)
+{
+  num_messages = 0;
+
+  assert(parser == NULL);
+
+  parser = malloc(sizeof(http_parser));
+
+  http_parser_init(parser, type);
+
+  memset(&messages, 0, sizeof messages);
+
+}
+
+void
+parser_free ()
+{
+  assert(parser);
+  free(parser);
+  parser = NULL;
+}
+
+size_t parse (const char *buf, size_t len)
+{
+  size_t nparsed;
+  currently_parsing_eof = (len == 0);
+  nparsed = http_parser_execute(parser, &settings, buf, len);
+  return nparsed;
+}
+
+size_t parse_count_body (const char *buf, size_t len)
+{
+  size_t nparsed;
+  currently_parsing_eof = (len == 0);
+  nparsed = http_parser_execute(parser, &settings_count_body, buf, len);
+  return nparsed;
+}
+
+size_t parse_pause (const char *buf, size_t len)
+{
+  size_t nparsed;
+  http_parser_settings s = settings_pause;
+
+  currently_parsing_eof = (len == 0);
+  current_pause_parser = &s;
+  nparsed = http_parser_execute(parser, current_pause_parser, buf, len);
+  return nparsed;
+}
+
+static inline int
+check_str_eq (const struct message *m,
+              const char *prop,
+              const char *expected,
+              const char *found) {
+  if ((expected == NULL) != (found == NULL)) {
+    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
+    printf("expected %s\n", (expected == NULL) ? "NULL" : expected);
+    printf("   found %s\n", (found == NULL) ? "NULL" : found);
+    return 0;
+  }
+  if (expected != NULL && 0 != strcmp(expected, found)) {
+    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
+    printf("expected '%s'\n", expected);
+    printf("   found '%s'\n", found);
+    return 0;
+  }
+  return 1;
+}
+
+static inline int
+check_num_eq (const struct message *m,
+              const char *prop,
+              int expected,
+              int found) {
+  if (expected != found) {
+    printf("\n*** Error: %s in '%s' ***\n\n", prop, m->name);
+    printf("expected %d\n", expected);
+    printf("   found %d\n", found);
+    return 0;
+  }
+  return 1;
+}
+
+#define MESSAGE_CHECK_STR_EQ(expected, found, prop) \
+  if (!check_str_eq(expected, #prop, expected->prop, found->prop)) return 0
+
+#define MESSAGE_CHECK_NUM_EQ(expected, found, prop) \
+  if (!check_num_eq(expected, #prop, expected->prop, found->prop)) return 0
+
+#define MESSAGE_CHECK_URL_EQ(u, expected, found, prop, fn)           \
+do {                                                                 \
+  char ubuf[256];                                                    \
+                                                                     \
+  if ((u)->field_set & (1 << (fn))) {                                \
+    memcpy(ubuf, (found)->request_url + (u)->field_data[(fn)].off,   \
+      (u)->field_data[(fn)].len);                                    \
+    ubuf[(u)->field_data[(fn)].len] = '\0';                          \
+  } else {                                                           \
+    ubuf[0] = '\0';                                                  \
+  }                                                                  \
+                                                                     \
+  check_str_eq(expected, #prop, expected->prop, ubuf);               \
+} while(0)
+
+int
+message_eq (int index, const struct message *expected)
+{
+  int i;
+  struct message *m = &messages[index];
+
+  MESSAGE_CHECK_NUM_EQ(expected, m, http_major);
+  MESSAGE_CHECK_NUM_EQ(expected, m, http_minor);
+
+  if (expected->type == HTTP_REQUEST) {
+    MESSAGE_CHECK_NUM_EQ(expected, m, method);
+  } else {
+    MESSAGE_CHECK_NUM_EQ(expected, m, status_code);
+    MESSAGE_CHECK_STR_EQ(expected, m, response_status);
+  }
+
+  MESSAGE_CHECK_NUM_EQ(expected, m, should_keep_alive);
+  MESSAGE_CHECK_NUM_EQ(expected, m, message_complete_on_eof);
+
+  assert(m->message_begin_cb_called);
+  assert(m->headers_complete_cb_called);
+  assert(m->message_complete_cb_called);
+
+
+  MESSAGE_CHECK_STR_EQ(expected, m, request_url);
+
+  /* Check URL components; we can't do this w/ CONNECT since it doesn't
+   * send us a well-formed URL.
+   */
+  if (*m->request_url && m->method != HTTP_CONNECT) {
+    struct http_parser_url u;
+
+    if (http_parser_parse_url(m->request_url, strlen(m->request_url), 0, &u)) {
+      fprintf(stderr, "\n\n*** failed to parse URL %s ***\n\n",
+        m->request_url);
+      abort();
+    }
+
+    if (expected->host) {
+      MESSAGE_CHECK_URL_EQ(&u, expected, m, host, UF_HOST);
+    }
+
+    if (expected->userinfo) {
+      MESSAGE_CHECK_URL_EQ(&u, expected, m, userinfo, UF_USERINFO);
+    }
+
+    m->port = (u.field_set & (1 << UF_PORT)) ?
+      u.port : 0;
+
+    MESSAGE_CHECK_URL_EQ(&u, expected, m, query_string, UF_QUERY);
+    MESSAGE_CHECK_URL_EQ(&u, expected, m, fragment, UF_FRAGMENT);
+    MESSAGE_CHECK_URL_EQ(&u, expected, m, request_path, UF_PATH);
+    MESSAGE_CHECK_NUM_EQ(expected, m, port);
+  }
+
+  if (expected->body_size) {
+    MESSAGE_CHECK_NUM_EQ(expected, m, body_size);
+  } else {
+    MESSAGE_CHECK_STR_EQ(expected, m, body);
+  }
+
+  assert(m->num_chunks == m->num_chunks_complete);
+  MESSAGE_CHECK_NUM_EQ(expected, m, num_chunks_complete);
+  for (i = 0; i < m->num_chunks && i < MAX_CHUNKS; i++) {
+    MESSAGE_CHECK_NUM_EQ(expected, m, chunk_lengths[i]);
+  }
+
+  MESSAGE_CHECK_NUM_EQ(expected, m, num_headers);
+
+  int r;
+  for (i = 0; i < m->num_headers; i++) {
+    r = check_str_eq(expected, "header field", expected->headers[i][0], m->headers[i][0]);
+    if (!r) return 0;
+    r = check_str_eq(expected, "header value", expected->headers[i][1], m->headers[i][1]);
+    if (!r) return 0;
+  }
+
+  MESSAGE_CHECK_STR_EQ(expected, m, upgrade);
+
+  return 1;
+}
+
+/* Given a sequence of varargs messages, return the number of them that the
+ * parser should successfully parse, taking into account that upgraded
+ * messages prevent all subsequent messages from being parsed.
+ */
+size_t
+count_parsed_messages(const size_t nmsgs, ...) {
+  size_t i;
+  va_list ap;
+
+  va_start(ap, nmsgs);
+
+  for (i = 0; i < nmsgs; i++) {
+    struct message *m = va_arg(ap, struct message *);
+
+    if (m->upgrade) {
+      va_end(ap);
+      return i + 1;
+    }
+  }
+
+  va_end(ap);
+  return nmsgs;
+}
+
+/* Given a sequence of bytes and the number of these that we were able to
+ * parse, verify that upgrade bodies are correct.
+ */
+void
+upgrade_message_fix(char *body, const size_t nread, const size_t nmsgs, ...) {
+  va_list ap;
+  size_t i;
+  size_t off = 0;
+ 
+  va_start(ap, nmsgs);
+
+  for (i = 0; i < nmsgs; i++) {
+    struct message *m = va_arg(ap, struct message *);
+
+    off += strlen(m->raw);
+
+    if (m->upgrade) {
+      off -= strlen(m->upgrade);
+
+      /* Check the portion of the response after its specified upgrade */
+      if (!check_str_eq(m, "upgrade", body + off, body + nread)) {
+        abort();
+      }
+
+      /* Fix up the response so that message_eq() will verify the beginning
+       * of the upgrade */
+      *(body + nread + strlen(m->upgrade)) = '\0';
+      messages[num_messages -1 ].upgrade = body + nread;
+
+      va_end(ap);
+      return;
+    }
+  }
+
+  va_end(ap);
+  printf("\n\n*** Error: expected a message with upgrade ***\n");
+
+  abort();
+}
+
+static void
+print_error (const char *raw, size_t error_location)
+{
+  fprintf(stderr, "\n*** %s ***\n\n",
+          http_errno_description(HTTP_PARSER_ERRNO(parser)));
+
+  int this_line = 0, char_len = 0;
+  size_t i, j, len = strlen(raw), error_location_line = 0;
+  for (i = 0; i < len; i++) {
+    if (i == error_location) this_line = 1;
+    switch (raw[i]) {
+      case '\r':
+        char_len = 2;
+        fprintf(stderr, "\\r");
+        break;
+
+      case '\n':
+        fprintf(stderr, "\\n\n");
+
+        if (this_line) goto print;
+
+        error_location_line = 0;
+        continue;
+
+      default:
+        char_len = 1;
+        fputc(raw[i], stderr);
+        break;
+    }
+    if (!this_line) error_location_line += char_len;
+  }
+
+  fprintf(stderr, "[eof]\n");
+
+ print:
+  for (j = 0; j < error_location_line; j++) {
+    fputc(' ', stderr);
+  }
+  fprintf(stderr, "^\n\nerror location: %u\n", (unsigned int)error_location);
+}
+
+void
+test_preserve_data (void)
+{
+  char my_data[] = "application-specific data";
+  http_parser parser;
+  parser.data = my_data;
+  http_parser_init(&parser, HTTP_REQUEST);
+  if (parser.data != my_data) {
+    printf("\n*** parser.data not preserved accross http_parser_init ***\n\n");
+    abort();
+  }
+}
+
+struct url_test {
+  const char *name;
+  const char *url;
+  int is_connect;
+  struct http_parser_url u;
+  int rv;
+};
+
+const struct url_test url_tests[] =
+{ {.name="proxy request"
+  ,.url="http://hostname/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PATH)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  7,  8 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 15,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="proxy request with port"
+  ,.url="http://hostname:444/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PORT) | (1 << UF_PATH)
+    ,.port=444
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  7,  8 } /* UF_HOST */
+      ,{ 16,  3 } /* UF_PORT */
+      ,{ 19,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="CONNECT request"
+  ,.url="hostname:443"
+  ,.is_connect=1
+  ,.u=
+    {.field_set=(1 << UF_HOST) | (1 << UF_PORT)
+    ,.port=443
+    ,.field_data=
+      {{  0,  0 } /* UF_SCHEMA */
+      ,{  0,  8 } /* UF_HOST */
+      ,{  9,  3 } /* UF_PORT */
+      ,{  0,  0 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="CONNECT request but not connect"
+  ,.url="hostname:443"
+  ,.is_connect=0
+  ,.rv=1
+  }
+
+, {.name="proxy ipv6 request"
+  ,.url="http://[1:2::3:4]/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PATH)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  8,  8 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 17,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="proxy ipv6 request with port"
+  ,.url="http://[1:2::3:4]:67/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PORT) | (1 << UF_PATH)
+    ,.port=67
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  8,  8 } /* UF_HOST */
+      ,{ 18,  2 } /* UF_PORT */
+      ,{ 20,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="CONNECT ipv6 address"
+  ,.url="[1:2::3:4]:443"
+  ,.is_connect=1
+  ,.u=
+    {.field_set=(1 << UF_HOST) | (1 << UF_PORT)
+    ,.port=443
+    ,.field_data=
+      {{  0,  0 } /* UF_SCHEMA */
+      ,{  1,  8 } /* UF_HOST */
+      ,{ 11,  3 } /* UF_PORT */
+      ,{  0,  0 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="ipv4 in ipv6 address"
+  ,.url="http://[2001:0000:0000:0000:0000:0000:1.9.1.1]/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set=(1 << UF_SCHEMA) | (1 << UF_HOST) | (1 << UF_PATH)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  8, 37 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 46,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="extra ? in query string"
+  ,.url="http://a.tbcdn.cn/p/fp/2010c/??fp-header-min.css,fp-base-min.css,"
+  "fp-channel-min.css,fp-product-min.css,fp-mall-min.css,fp-category-min.css,"
+  "fp-sub-min.css,fp-gdp4p-min.css,fp-css3-min.css,fp-misc-min.css?t=20101022.css"
+  ,.is_connect=0
+  ,.u=
+    {.field_set=(1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  7, 10 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 17, 12 } /* UF_PATH */
+      ,{ 30,187 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="space URL encoded"
+  ,.url="/toto.html?toto=a%20b"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_PATH) | (1<<UF_QUERY)
+    ,.port=0
+    ,.field_data=
+      {{  0,  0 } /* UF_SCHEMA */
+      ,{  0,  0 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{  0, 10 } /* UF_PATH */
+      ,{ 11, 10 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+
+, {.name="URL fragment"
+  ,.url="/toto.html#titi"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_PATH) | (1<<UF_FRAGMENT)
+    ,.port=0
+    ,.field_data=
+      {{  0,  0 } /* UF_SCHEMA */
+      ,{  0,  0 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{  0, 10 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{ 11,  4 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="complex URL fragment"
+  ,.url="http://www.webmasterworld.com/r.cgi?f=21&d=8405&url="
+    "http://www.example.com/index.html?foo=bar&hello=world#midpage"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_QUERY) |\
+      (1<<UF_FRAGMENT)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  7, 22 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 29,  6 } /* UF_PATH */
+      ,{ 36, 69 } /* UF_QUERY */
+      ,{106,  7 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="complex URL from node js url parser doc"
+  ,.url="http://host.com:8080/p/a/t/h?query=string#hash"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) |\
+      (1<<UF_QUERY) | (1<<UF_FRAGMENT)
+    ,.port=8080
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  7,  8 } /* UF_HOST */
+      ,{ 16,  4 } /* UF_PORT */
+      ,{ 20,  8 } /* UF_PATH */
+      ,{ 29, 12 } /* UF_QUERY */
+      ,{ 42,  4 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="complex URL with basic auth from node js url parser doc"
+  ,.url="http://a:b@host.com:8080/p/a/t/h?query=string#hash"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PORT) | (1<<UF_PATH) |\
+      (1<<UF_QUERY) | (1<<UF_FRAGMENT) | (1<<UF_USERINFO)
+    ,.port=8080
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{ 11,  8 } /* UF_HOST */
+      ,{ 20,  4 } /* UF_PORT */
+      ,{ 24,  8 } /* UF_PATH */
+      ,{ 33, 12 } /* UF_QUERY */
+      ,{ 46,  4 } /* UF_FRAGMENT */
+      ,{  7,  3 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="double @"
+  ,.url="http://a:b@@hostname:443/"
+  ,.is_connect=0
+  ,.rv=1
+  }
+
+, {.name="proxy empty host"
+  ,.url="http://:443/"
+  ,.is_connect=0
+  ,.rv=1
+  }
+
+, {.name="proxy empty port"
+  ,.url="http://hostname:/"
+  ,.is_connect=0
+  ,.rv=1
+  }
+
+, {.name="CONNECT with basic auth"
+  ,.url="a:b@hostname:443"
+  ,.is_connect=1
+  ,.rv=1
+  }
+
+, {.name="CONNECT empty host"
+  ,.url=":443"
+  ,.is_connect=1
+  ,.rv=1
+  }
+
+, {.name="CONNECT empty port"
+  ,.url="hostname:"
+  ,.is_connect=1
+  ,.rv=1
+  }
+
+, {.name="CONNECT with extra bits"
+  ,.url="hostname:443/"
+  ,.is_connect=1
+  ,.rv=1
+  }
+
+, {.name="space in URL"
+  ,.url="/foo bar/"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy basic auth with space url encoded"
+  ,.url="http://a%20:b@host.com/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_USERINFO)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{ 14,  8 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 22,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  7,  6 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="carriage return in URL"
+  ,.url="/foo\rbar/"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy double : in URL"
+  ,.url="http://hostname::443/"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy basic auth with double :"
+  ,.url="http://a::b@host.com/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_USERINFO)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{ 12,  8 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 20,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  7,  4 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="line feed in URL"
+  ,.url="/foo\nbar/"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy empty basic auth"
+  ,.url="http://@hostname/fo"
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{  8,  8 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 16,  3 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+, {.name="proxy line feed in hostname"
+  ,.url="http://host\name/fo"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy % in hostname"
+  ,.url="http://host%name/fo"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy ; in hostname"
+  ,.url="http://host;ame/fo"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy basic auth with unreservedchars"
+  ,.url="http://a!;-_!=+$@host.com/"
+  ,.is_connect=0
+  ,.u=
+    {.field_set= (1<<UF_SCHEMA) | (1<<UF_HOST) | (1<<UF_PATH) | (1<<UF_USERINFO)
+    ,.port=0
+    ,.field_data=
+      {{  0,  4 } /* UF_SCHEMA */
+      ,{ 17,  8 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{ 25,  1 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  7,  9 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="proxy only empty basic auth"
+  ,.url="http://@/fo"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy only basic auth"
+  ,.url="http://toto@/fo"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy emtpy hostname"
+  ,.url="http:///fo"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="proxy = in URL"
+  ,.url="http://host=ame/fo"
+  ,.rv=1 /* s_dead */
+  }
+
+#if HTTP_PARSER_STRICT
+
+, {.name="tab in URL"
+  ,.url="/foo\tbar/"
+  ,.rv=1 /* s_dead */
+  }
+
+, {.name="form feed in URL"
+  ,.url="/foo\fbar/"
+  ,.rv=1 /* s_dead */
+  }
+
+#else /* !HTTP_PARSER_STRICT */
+
+, {.name="tab in URL"
+  ,.url="/foo\tbar/"
+  ,.u=
+    {.field_set=(1 << UF_PATH)
+    ,.field_data=
+      {{  0,  0 } /* UF_SCHEMA */
+      ,{  0,  0 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{  0,  9 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+
+, {.name="form feed in URL"
+  ,.url="/foo\fbar/"
+  ,.u=
+    {.field_set=(1 << UF_PATH)
+    ,.field_data=
+      {{  0,  0 } /* UF_SCHEMA */
+      ,{  0,  0 } /* UF_HOST */
+      ,{  0,  0 } /* UF_PORT */
+      ,{  0,  9 } /* UF_PATH */
+      ,{  0,  0 } /* UF_QUERY */
+      ,{  0,  0 } /* UF_FRAGMENT */
+      ,{  0,  0 } /* UF_USERINFO */
+      }
+    }
+  ,.rv=0
+  }
+#endif
+};
+
+void
+dump_url (const char *url, const struct http_parser_url *u)
+{
+  unsigned int i;
+
+  printf("\tfield_set: 0x%x, port: %u\n", u->field_set, u->port);
+  for (i = 0; i < UF_MAX; i++) {
+    if ((u->field_set & (1 << i)) == 0) {
+      printf("\tfield_data[%u]: unset\n", i);
+      continue;
+    }
+
+    printf("\tfield_data[%u]: off: %u len: %u part: \"%.*s\n\"",
+           i,
+           u->field_data[i].off,
+           u->field_data[i].len,
+           u->field_data[i].len,
+           url + u->field_data[i].off);
+  }
+}
+
+void
+test_parse_url (void)
+{
+  struct http_parser_url u;
+  const struct url_test *test;
+  unsigned int i;
+  int rv;
+
+  for (i = 0; i < (sizeof(url_tests) / sizeof(url_tests[0])); i++) {
+    test = &url_tests[i];
+    memset(&u, 0, sizeof(u));
+
+    rv = http_parser_parse_url(test->url,
+                               strlen(test->url),
+                               test->is_connect,
+                               &u);
+
+    if (test->rv == 0) {
+      if (rv != 0) {
+        printf("\n*** http_parser_parse_url(\"%s\") \"%s\" test failed, "
+               "unexpected rv %d ***\n\n", test->url, test->name, rv);
+        abort();
+      }
+
+      if (memcmp(&u, &test->u, sizeof(u)) != 0) {
+        printf("\n*** http_parser_parse_url(\"%s\") \"%s\" failed ***\n",
+               test->url, test->name);
+
+        printf("target http_parser_url:\n");
+        dump_url(test->url, &test->u);
+        printf("result http_parser_url:\n");
+        dump_url(test->url, &u);
+
+        abort();
+      }
+    } else {
+      /* test->rv != 0 */
+      if (rv == 0) {
+        printf("\n*** http_parser_parse_url(\"%s\") \"%s\" test failed, "
+               "unexpected rv %d ***\n\n", test->url, test->name, rv);
+        abort();
+      }
+    }
+  }
+}
+
+void
+test_method_str (void)
+{
+  assert(0 == strcmp("GET", http_method_str(HTTP_GET)));
+  assert(0 == strcmp("<unknown>", http_method_str(1337)));
+}
+
+void
+test_message (const struct message *message)
+{
+  size_t raw_len = strlen(message->raw);
+  size_t msg1len;
+  for (msg1len = 0; msg1len < raw_len; msg1len++) {
+    parser_init(message->type);
+
+    size_t read;
+    const char *msg1 = message->raw;
+    const char *msg2 = msg1 + msg1len;
+    size_t msg2len = raw_len - msg1len;
+
+    if (msg1len) {
+      read = parse(msg1, msg1len);
+
+      if (message->upgrade && parser->upgrade && num_messages > 0) {
+        messages[num_messages - 1].upgrade = msg1 + read;
+        goto test;
+      }
+
+      if (read != msg1len) {
+        print_error(msg1, read);
+        abort();
+      }
+    }
+
+
+    read = parse(msg2, msg2len);
+
+    if (message->upgrade && parser->upgrade) {
+      messages[num_messages - 1].upgrade = msg2 + read;
+      goto test;
+    }
+
+    if (read != msg2len) {
+      print_error(msg2, read);
+      abort();
+    }
+
+    read = parse(NULL, 0);
+
+    if (read != 0) {
+      print_error(message->raw, read);
+      abort();
+    }
+
+  test:
+
+    if (num_messages != 1) {
+      printf("\n*** num_messages != 1 after testing '%s' ***\n\n", message->name);
+      abort();
+    }
+
+    if(!message_eq(0, message)) abort();
+
+    parser_free();
+  }
+}
+
+void
+test_message_count_body (const struct message *message)
+{
+  parser_init(message->type);
+
+  size_t read;
+  size_t l = strlen(message->raw);
+  size_t i, toread;
+  size_t chunk = 4024;
+
+  for (i = 0; i < l; i+= chunk) {
+    toread = MIN(l-i, chunk);
+    read = parse_count_body(message->raw + i, toread);
+    if (read != toread) {
+      print_error(message->raw, read);
+      abort();
+    }
+  }
+
+
+  read = parse_count_body(NULL, 0);
+  if (read != 0) {
+    print_error(message->raw, read);
+    abort();
+  }
+
+  if (num_messages != 1) {
+    printf("\n*** num_messages != 1 after testing '%s' ***\n\n", message->name);
+    abort();
+  }
+
+  if(!message_eq(0, message)) abort();
+
+  parser_free();
+}
+
+void
+test_simple (const char *buf, enum http_errno err_expected)
+{
+  parser_init(HTTP_REQUEST);
+
+  enum http_errno err;
+
+  parse(buf, strlen(buf));
+  err = HTTP_PARSER_ERRNO(parser);
+  parse(NULL, 0);
+
+  parser_free();
+
+  /* In strict mode, allow us to pass with an unexpected HPE_STRICT as
+   * long as the caller isn't expecting success.
+   */
+#if HTTP_PARSER_STRICT
+  if (err_expected != err && err_expected != HPE_OK && err != HPE_STRICT) {
+#else
+  if (err_expected != err) {
+#endif
+    fprintf(stderr, "\n*** test_simple expected %s, but saw %s ***\n\n%s\n",
+        http_errno_name(err_expected), http_errno_name(err), buf);
+    abort();
+  }
+}
+
+void
+test_header_overflow_error (int req)
+{
+  http_parser parser;
+  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
+  size_t parsed;
+  const char *buf;
+  buf = req ? "GET / HTTP/1.1\r\n" : "HTTP/1.0 200 OK\r\n";
+  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
+  assert(parsed == strlen(buf));
+
+  buf = "header-key: header-value\r\n";
+  size_t buflen = strlen(buf);
+
+  int i;
+  for (i = 0; i < 10000; i++) {
+    parsed = http_parser_execute(&parser, &settings_null, buf, buflen);
+    if (parsed != buflen) {
+      //fprintf(stderr, "error found on iter %d\n", i);
+      assert(HTTP_PARSER_ERRNO(&parser) == HPE_HEADER_OVERFLOW);
+      return;
+    }
+  }
+
+  fprintf(stderr, "\n*** Error expected but none in header overflow test ***\n");
+  abort();
+}
+
+
+void
+test_header_nread_value ()
+{
+  http_parser parser;
+  http_parser_init(&parser, HTTP_REQUEST);
+  size_t parsed;
+  const char *buf;
+  buf = "GET / HTTP/1.1\r\nheader: value\nhdr: value\r\n";
+  parsed = http_parser_execute(&parser, &settings_null, buf, strlen(buf));
+  assert(parsed == strlen(buf));
+
+  assert(parser.nread == strlen(buf));
+}
+
+
+static void
+test_content_length_overflow (const char *buf, size_t buflen, int expect_ok)
+{
+  http_parser parser;
+  http_parser_init(&parser, HTTP_RESPONSE);
+  http_parser_execute(&parser, &settings_null, buf, buflen);
+
+  if (expect_ok)
+    assert(HTTP_PARSER_ERRNO(&parser) == HPE_OK);
+  else
+    assert(HTTP_PARSER_ERRNO(&parser) == HPE_INVALID_CONTENT_LENGTH);
+}
+
+void
+test_header_content_length_overflow_error (void)
+{
+#define X(size)                                                               \
+  "HTTP/1.1 200 OK\r\n"                                                       \
+  "Content-Length: " #size "\r\n"                                             \
+  "\r\n"
+  const char a[] = X(1844674407370955160);  /* 2^64 / 10 - 1 */
+  const char b[] = X(18446744073709551615); /* 2^64-1 */
+  const char c[] = X(18446744073709551616); /* 2^64   */
+#undef X
+  test_content_length_overflow(a, sizeof(a) - 1, 1); /* expect ok      */
+  test_content_length_overflow(b, sizeof(b) - 1, 0); /* expect failure */
+  test_content_length_overflow(c, sizeof(c) - 1, 0); /* expect failure */
+}
+
+void
+test_chunk_content_length_overflow_error (void)
+{
+#define X(size)                                                               \
+    "HTTP/1.1 200 OK\r\n"                                                     \
+    "Transfer-Encoding: chunked\r\n"                                          \
+    "\r\n"                                                                    \
+    #size "\r\n"                                                              \
+    "..."
+  const char a[] = X(FFFFFFFFFFFFFFE);   /* 2^64 / 16 - 1 */
+  const char b[] = X(FFFFFFFFFFFFFFFF);  /* 2^64-1 */
+  const char c[] = X(10000000000000000); /* 2^64   */
+#undef X
+  test_content_length_overflow(a, sizeof(a) - 1, 1); /* expect ok      */
+  test_content_length_overflow(b, sizeof(b) - 1, 0); /* expect failure */
+  test_content_length_overflow(c, sizeof(c) - 1, 0); /* expect failure */
+}
+
+void
+test_no_overflow_long_body (int req, size_t length)
+{
+  http_parser parser;
+  http_parser_init(&parser, req ? HTTP_REQUEST : HTTP_RESPONSE);
+  size_t parsed;
+  size_t i;
+  char buf1[3000];
+  size_t buf1len = sprintf(buf1, "%s\r\nConnection: Keep-Alive\r\nContent-Length: %lu\r\n\r\n",
+      req ? "POST / HTTP/1.0" : "HTTP/1.0 200 OK", (unsigned long)length);
+  parsed = http_parser_execute(&parser, &settings_null, buf1, buf1len);
+  if (parsed != buf1len)
+    goto err;
+
+  for (i = 0; i < length; i++) {
+    char foo = 'a';
+    parsed = http_parser_execute(&parser, &settings_null, &foo, 1);
+    if (parsed != 1)
+      goto err;
+  }
+
+  parsed = http_parser_execute(&parser, &settings_null, buf1, buf1len);
+  if (parsed != buf1len) goto err;
+  return;
+
+ err:
+  fprintf(stderr,
+          "\n*** error in test_no_overflow_long_body %s of length %lu ***\n",
+          req ? "REQUEST" : "RESPONSE",
+          (unsigned long)length);
+  abort();
+}
+
+void
+test_multiple3 (const struct message *r1, const struct message *r2, const struct message *r3)
+{
+  int message_count = count_parsed_messages(3, r1, r2, r3);
+
+  char total[ strlen(r1->raw)
+            + strlen(r2->raw)
+            + strlen(r3->raw)
+            + 1
+            ];
+  total[0] = '\0';
+
+  strcat(total, r1->raw);
+  strcat(total, r2->raw);
+  strcat(total, r3->raw);
+
+  parser_init(r1->type);
+
+  size_t read;
+
+  read = parse(total, strlen(total));
+
+  if (parser->upgrade) {
+    upgrade_message_fix(total, read, 3, r1, r2, r3);
+    goto test;
+  }
+
+  if (read != strlen(total)) {
+    print_error(total, read);
+    abort();
+  }
+
+  read = parse(NULL, 0);
+
+  if (read != 0) {
+    print_error(total, read);
+    abort();
+  }
+
+test:
+
+  if (message_count != num_messages) {
+    fprintf(stderr, "\n\n*** Parser didn't see 3 messages only %d *** \n", num_messages);
+    abort();
+  }
+
+  if (!message_eq(0, r1)) abort();
+  if (message_count > 1 && !message_eq(1, r2)) abort();
+  if (message_count > 2 && !message_eq(2, r3)) abort();
+
+  parser_free();
+}
+
+/* SCAN through every possible breaking to make sure the
+ * parser can handle getting the content in any chunks that
+ * might come from the socket
+ */
+void
+test_scan (const struct message *r1, const struct message *r2, const struct message *r3)
+{
+  char total[80*1024] = "\0";
+  char buf1[80*1024] = "\0";
+  char buf2[80*1024] = "\0";
+  char buf3[80*1024] = "\0";
+
+  strcat(total, r1->raw);
+  strcat(total, r2->raw);
+  strcat(total, r3->raw);
+
+  size_t read;
+
+  int total_len = strlen(total);
+
+  int total_ops = 2 * (total_len - 1) * (total_len - 2) / 2;
+  int ops = 0 ;
+
+  size_t buf1_len, buf2_len, buf3_len;
+  int message_count = count_parsed_messages(3, r1, r2, r3);
+
+  int i,j,type_both;
+  for (type_both = 0; type_both < 2; type_both ++ ) {
+    for (j = 2; j < total_len; j ++ ) {
+      for (i = 1; i < j; i ++ ) {
+
+        if (ops % 1000 == 0)  {
+          printf("\b\b\b\b%3.0f%%", 100 * (float)ops /(float)total_ops);
+          fflush(stdout);
+        }
+        ops += 1;
+
+        parser_init(type_both ? HTTP_BOTH : r1->type);
+
+        buf1_len = i;
+        strlncpy(buf1, sizeof(buf1), total, buf1_len);
+        buf1[buf1_len] = 0;
+
+        buf2_len = j - i;
+        strlncpy(buf2, sizeof(buf1), total+i, buf2_len);
+        buf2[buf2_len] = 0;
+
+        buf3_len = total_len - j;
+        strlncpy(buf3, sizeof(buf1), total+j, buf3_len);
+        buf3[buf3_len] = 0;
+
+        read = parse(buf1, buf1_len);
+
+        if (parser->upgrade) goto test;
+
+        if (read != buf1_len) {
+          print_error(buf1, read);
+          goto error;
+        }
+
+        read += parse(buf2, buf2_len);
+
+        if (parser->upgrade) goto test;
+
+        if (read != buf1_len + buf2_len) {
+          print_error(buf2, read);
+          goto error;
+        }
+
+        read += parse(buf3, buf3_len);
+
+        if (parser->upgrade) goto test;
+
+        if (read != buf1_len + buf2_len + buf3_len) {
+          print_error(buf3, read);
+          goto error;
+        }
+
+        parse(NULL, 0);
+
+test:
+        if (parser->upgrade) {
+          upgrade_message_fix(total, read, 3, r1, r2, r3);
+        }
+
+        if (message_count != num_messages) {
+          fprintf(stderr, "\n\nParser didn't see %d messages only %d\n",
+            message_count, num_messages);
+          goto error;
+        }
+
+        if (!message_eq(0, r1)) {
+          fprintf(stderr, "\n\nError matching messages[0] in test_scan.\n");
+          goto error;
+        }
+
+        if (message_count > 1 && !message_eq(1, r2)) {
+          fprintf(stderr, "\n\nError matching messages[1] in test_scan.\n");
+          goto error;
+        }
+
+        if (message_count > 2 && !message_eq(2, r3)) {
+          fprintf(stderr, "\n\nError matching messages[2] in test_scan.\n");
+          goto error;
+        }
+
+        parser_free();
+      }
+    }
+  }
+  puts("\b\b\b\b100%");
+  return;
+
+ error:
+  fprintf(stderr, "i=%d  j=%d\n", i, j);
+  fprintf(stderr, "buf1 (%u) %s\n\n", (unsigned int)buf1_len, buf1);
+  fprintf(stderr, "buf2 (%u) %s\n\n", (unsigned int)buf2_len , buf2);
+  fprintf(stderr, "buf3 (%u) %s\n", (unsigned int)buf3_len, buf3);
+  abort();
+}
+
+// user required to free the result
+// string terminated by \0
+char *
+create_large_chunked_message (int body_size_in_kb, const char* headers)
+{
+  int i;
+  size_t wrote = 0;
+  size_t headers_len = strlen(headers);
+  size_t bufsize = headers_len + (5+1024+2)*body_size_in_kb + 6;
+  char * buf = malloc(bufsize);
+
+  memcpy(buf, headers, headers_len);
+  wrote += headers_len;
+
+  for (i = 0; i < body_size_in_kb; i++) {
+    // write 1kb chunk into the body.
+    memcpy(buf + wrote, "400\r\n", 5);
+    wrote += 5;
+    memset(buf + wrote, 'C', 1024);
+    wrote += 1024;
+    strcpy(buf + wrote, "\r\n");
+    wrote += 2;
+  }
+
+  memcpy(buf + wrote, "0\r\n\r\n", 6);
+  wrote += 6;
+  assert(wrote == bufsize);
+
+  return buf;
+}
+
+/* Verify that we can pause parsing at any of the bytes in the
+ * message and still get the result that we're expecting. */
+void
+test_message_pause (const struct message *msg)
+{
+  char *buf = (char*) msg->raw;
+  size_t buflen = strlen(msg->raw);
+  size_t nread;
+
+  parser_init(msg->type);
+
+  do {
+    nread = parse_pause(buf, buflen);
+
+    // We can only set the upgrade buffer once we've gotten our message
+    // completion callback.
+    if (messages[0].message_complete_cb_called &&
+        msg->upgrade &&
+        parser->upgrade) {
+      messages[0].upgrade = buf + nread;
+      goto test;
+    }
+
+    if (nread < buflen) {
+
+      // Not much do to if we failed a strict-mode check
+      if (HTTP_PARSER_ERRNO(parser) == HPE_STRICT) {
+        parser_free();
+        return;
+      }
+
+      assert (HTTP_PARSER_ERRNO(parser) == HPE_PAUSED);
+    }
+
+    buf += nread;
+    buflen -= nread;
+    http_parser_pause(parser, 0);
+  } while (buflen > 0);
+
+  nread = parse_pause(NULL, 0);
+  assert (nread == 0);
+
+test:
+  if (num_messages != 1) {
+    printf("\n*** num_messages != 1 after testing '%s' ***\n\n", msg->name);
+    abort();
+  }
+
+  if(!message_eq(0, msg)) abort();
+
+  parser_free();
+}
+
+int
+main (void)
+{
+  parser = NULL;
+  int i, j, k;
+  int request_count;
+  int response_count;
+  unsigned long version;
+  unsigned major;
+  unsigned minor;
+  unsigned patch;
+
+  version = http_parser_version();
+  major = (version >> 16) & 255;
+  minor = (version >> 8) & 255;
+  patch = version & 255;
+  printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version);
+
+  printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser));
+
+  for (request_count = 0; requests[request_count].name; request_count++);
+  for (response_count = 0; responses[response_count].name; response_count++);
+
+  //// API
+  test_preserve_data();
+  test_parse_url();
+  test_method_str();
+
+  //// NREAD
+  test_header_nread_value();
+
+  //// OVERFLOW CONDITIONS
+
+  test_header_overflow_error(HTTP_REQUEST);
+  test_no_overflow_long_body(HTTP_REQUEST, 1000);
+  test_no_overflow_long_body(HTTP_REQUEST, 100000);
+
+  test_header_overflow_error(HTTP_RESPONSE);
+  test_no_overflow_long_body(HTTP_RESPONSE, 1000);
+  test_no_overflow_long_body(HTTP_RESPONSE, 100000);
+
+  test_header_content_length_overflow_error();
+  test_chunk_content_length_overflow_error();
+
+  //// RESPONSES
+
+  for (i = 0; i < response_count; i++) {
+    test_message(&responses[i]);
+  }
+
+  for (i = 0; i < response_count; i++) {
+    test_message_pause(&responses[i]);
+  }
+
+  for (i = 0; i < response_count; i++) {
+    if (!responses[i].should_keep_alive) continue;
+    for (j = 0; j < response_count; j++) {
+      if (!responses[j].should_keep_alive) continue;
+      for (k = 0; k < response_count; k++) {
+        test_multiple3(&responses[i], &responses[j], &responses[k]);
+      }
+    }
+  }
+
+  test_message_count_body(&responses[NO_HEADERS_NO_BODY_404]);
+  test_message_count_body(&responses[TRAILING_SPACE_ON_CHUNKED_BODY]);
+
+  // test very large chunked response
+  {
+    char * msg = create_large_chunked_message(31337,
+      "HTTP/1.0 200 OK\r\n"
+      "Transfer-Encoding: chunked\r\n"
+      "Content-Type: text/plain\r\n"
+      "\r\n");
+    struct message large_chunked =
+      {.name= "large chunked"
+      ,.type= HTTP_RESPONSE
+      ,.raw= msg
+      ,.should_keep_alive= FALSE
+      ,.message_complete_on_eof= FALSE
+      ,.http_major= 1
+      ,.http_minor= 0
+      ,.status_code= 200
+      ,.response_status= "OK"
+      ,.num_headers= 2
+      ,.headers=
+        { { "Transfer-Encoding", "chunked" }
+        , { "Content-Type", "text/plain" }
+        }
+      ,.body_size= 31337*1024
+      ,.num_chunks_complete= 31338
+      };
+    for (i = 0; i < MAX_CHUNKS; i++) {
+      large_chunked.chunk_lengths[i] = 1024;
+    }
+    test_message_count_body(&large_chunked);
+    free(msg);
+  }
+
+
+
+  printf("response scan 1/2      ");
+  test_scan( &responses[TRAILING_SPACE_ON_CHUNKED_BODY]
+           , &responses[NO_BODY_HTTP10_KA_204]
+           , &responses[NO_REASON_PHRASE]
+           );
+
+  printf("response scan 2/2      ");
+  test_scan( &responses[BONJOUR_MADAME_FR]
+           , &responses[UNDERSTORE_HEADER_KEY]
+           , &responses[NO_CARRIAGE_RET]
+           );
+
+  puts("responses okay");
+
+
+  /// REQUESTS
+
+  test_simple("GET / HTP/1.1\r\n\r\n", HPE_INVALID_VERSION);
+
+  // Well-formed but incomplete
+  test_simple("GET / HTTP/1.1\r\n"
+              "Content-Type: text/plain\r\n"
+              "Content-Length: 6\r\n"
+              "\r\n"
+              "fooba",
+              HPE_OK);
+
+  static const char *all_methods[] = {
+    "DELETE",
+    "GET",
+    "HEAD",
+    "POST",
+    "PUT",
+    //"CONNECT", //CONNECT can't be tested like other methods, it's a tunnel
+    "OPTIONS",
+    "TRACE",
+    "COPY",
+    "LOCK",
+    "MKCOL",
+    "MOVE",
+    "PROPFIND",
+    "PROPPATCH",
+    "UNLOCK",
+    "REPORT",
+    "MKACTIVITY",
+    "CHECKOUT",
+    "MERGE",
+    "M-SEARCH",
+    "NOTIFY",
+    "SUBSCRIBE",
+    "UNSUBSCRIBE",
+    "PATCH",
+    0 };
+  const char **this_method;
+  for (this_method = all_methods; *this_method; this_method++) {
+    char buf[200];
+    sprintf(buf, "%s / HTTP/1.1\r\n\r\n", *this_method);
+    test_simple(buf, HPE_OK);
+  }
+
+  static const char *bad_methods[] = {
+      "ASDF",
+      "C******",
+      "COLA",
+      "GEM",
+      "GETA",
+      "M****",
+      "MKCOLA",
+      "PROPPATCHA",
+      "PUN",
+      "PX",
+      "SA",
+      "hello world",
+      0 };
+  for (this_method = bad_methods; *this_method; this_method++) {
+    char buf[200];
+    sprintf(buf, "%s / HTTP/1.1\r\n\r\n", *this_method);
+    test_simple(buf, HPE_INVALID_METHOD);
+  }
+
+  // illegal header field name line folding
+  test_simple("GET / HTTP/1.1\r\n"
+              "name\r\n"
+              " : value\r\n"
+              "\r\n",
+              HPE_INVALID_HEADER_TOKEN);
+
+  const char *dumbfuck2 =
+    "GET / HTTP/1.1\r\n"
+    "X-SSL-Bullshit:   -----BEGIN CERTIFICATE-----\r\n"
+    "\tMIIFbTCCBFWgAwIBAgICH4cwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UEBhMCVUsx\r\n"
+    "\tETAPBgNVBAoTCGVTY2llbmNlMRIwEAYDVQQLEwlBdXRob3JpdHkxCzAJBgNVBAMT\r\n"
+    "\tAkNBMS0wKwYJKoZIhvcNAQkBFh5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMu\r\n"
+    "\tdWswHhcNMDYwNzI3MTQxMzI4WhcNMDcwNzI3MTQxMzI4WjBbMQswCQYDVQQGEwJV\r\n"
+    "\tSzERMA8GA1UEChMIZVNjaWVuY2UxEzARBgNVBAsTCk1hbmNoZXN0ZXIxCzAJBgNV\r\n"
+    "\tBAcTmrsogriqMWLAk1DMRcwFQYDVQQDEw5taWNoYWVsIHBhcmQYJKoZIhvcNAQEB\r\n"
+    "\tBQADggEPADCCAQoCggEBANPEQBgl1IaKdSS1TbhF3hEXSl72G9J+WC/1R64fAcEF\r\n"
+    "\tW51rEyFYiIeZGx/BVzwXbeBoNUK41OK65sxGuflMo5gLflbwJtHBRIEKAfVVp3YR\r\n"
+    "\tgW7cMA/s/XKgL1GEC7rQw8lIZT8RApukCGqOVHSi/F1SiFlPDxuDfmdiNzL31+sL\r\n"
+    "\t0iwHDdNkGjy5pyBSB8Y79dsSJtCW/iaLB0/n8Sj7HgvvZJ7x0fr+RQjYOUUfrePP\r\n"
+    "\tu2MSpFyf+9BbC/aXgaZuiCvSR+8Snv3xApQY+fULK/xY8h8Ua51iXoQ5jrgu2SqR\r\n"
+    "\twgA7BUi3G8LFzMBl8FRCDYGUDy7M6QaHXx1ZWIPWNKsCAwEAAaOCAiQwggIgMAwG\r\n"
+    "\tA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgHTTPAQDAgWgMA4GA1UdDwEB/wQEAwID6DAs\r\n"
+    "\tBglghkgBhvhCAQ0EHxYdVUsgZS1TY2llbmNlIFVzZXIgQ2VydGlmaWNhdGUwHQYD\r\n"
+    "\tVR0OBBYEFDTt/sf9PeMaZDHkUIldrDYMNTBZMIGaBgNVHSMEgZIwgY+AFAI4qxGj\r\n"
+    "\tloCLDdMVKwiljjDastqooXSkcjBwMQswCQYDVQQGEwJVSzERMA8GA1UEChMIZVNj\r\n"
+    "\taWVuY2UxEjAQBgNVBAsTCUF1dGhvcml0eTELMAkGA1UEAxMCQ0ExLTArBgkqhkiG\r\n"
+    "\t9w0BCQEWHmNhLW9wZXJhdG9yQGdyaWQtc3VwcG9ydC5hYy51a4IBADApBgNVHRIE\r\n"
+    "\tIjAggR5jYS1vcGVyYXRvckBncmlkLXN1cHBvcnQuYWMudWswGQYDVR0gBBIwEDAO\r\n"
+    "\tBgwrBgEEAdkvAQEBAQYwPQYJYIZIAYb4QgEEBDAWLmh0dHA6Ly9jYS5ncmlkLXN1\r\n"
+    "\tcHBvcnQuYWMudmT4sopwqlBWsvcHViL2NybC9jYWNybC5jcmwwPQYJYIZIAYb4QgEDBDAWLmh0\r\n"
+    "\tdHA6Ly9jYS5ncmlkLXN1cHBvcnQuYWMudWsvcHViL2NybC9jYWNybC5jcmwwPwYD\r\n"
+    "\tVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NhLmdyaWQt5hYy51ay9wdWIv\r\n"
+    "\tY3JsL2NhY3JsLmNybDANBgkqhkiG9w0BAQUFAAOCAQEAS/U4iiooBENGW/Hwmmd3\r\n"
+    "\tXCy6Zrt08YjKCzGNjorT98g8uGsqYjSxv/hmi0qlnlHs+k/3Iobc3LjS5AMYr5L8\r\n"
+    "\tUO7OSkgFFlLHQyC9JzPfmLCAugvzEbyv4Olnsr8hbxF1MbKZoQxUZtMVu29wjfXk\r\n"
+    "\thTeApBv7eaKCWpSp7MCbvgzm74izKhu3vlDk9w6qVrxePfGgpKPqfHiOoGhFnbTK\r\n"
+    "\twTC6o2xq5y0qZ03JonF7OJspEd3I5zKY3E+ov7/ZhW6DqT8UFvsAdjvQbXyhV8Eu\r\n"
+    "\tYhixw1aKEPzNjNowuIseVogKOLXxWI5vAi5HgXdS0/ES5gDGsABo4fqovUKlgop3\r\n"
+    "\tRA==\r\n"
+    "\t-----END CERTIFICATE-----\r\n"
+    "\r\n";
+  test_simple(dumbfuck2, HPE_OK);
+
+  const char *corrupted_connection =
+    "GET / HTTP/1.1\r\n"
+    "Host: www.example.com\r\n"
+    "Connection\r\033\065\325eep-Alive\r\n"
+    "Accept-Encoding: gzip\r\n"
+    "\r\n";
+  test_simple(corrupted_connection, HPE_INVALID_HEADER_TOKEN);
+
+  const char *corrupted_header_name =
+    "GET / HTTP/1.1\r\n"
+    "Host: www.example.com\r\n"
+    "X-Some-Header\r\033\065\325eep-Alive\r\n"
+    "Accept-Encoding: gzip\r\n"
+    "\r\n";
+  test_simple(corrupted_header_name, HPE_INVALID_HEADER_TOKEN);
+
+#if 0
+  // NOTE(Wed Nov 18 11:57:27 CET 2009) this seems okay. we just read body
+  // until EOF.
+  //
+  // no content-length
+  // error if there is a body without content length
+  const char *bad_get_no_headers_no_body = "GET /bad_get_no_headers_no_body/world HTTP/1.1\r\n"
+                                           "Accept: */*\r\n"
+                                           "\r\n"
+                                           "HELLO";
+  test_simple(bad_get_no_headers_no_body, 0);
+#endif
+  /* TODO sending junk and large headers gets rejected */
+
+
+  /* check to make sure our predefined requests are okay */
+  for (i = 0; requests[i].name; i++) {
+    test_message(&requests[i]);
+  }
+
+  for (i = 0; i < request_count; i++) {
+    test_message_pause(&requests[i]);
+  }
+
+  for (i = 0; i < request_count; i++) {
+    if (!requests[i].should_keep_alive) continue;
+    for (j = 0; j < request_count; j++) {
+      if (!requests[j].should_keep_alive) continue;
+      for (k = 0; k < request_count; k++) {
+        test_multiple3(&requests[i], &requests[j], &requests[k]);
+      }
+    }
+  }
+
+  printf("request scan 1/4      ");
+  test_scan( &requests[GET_NO_HEADERS_NO_BODY]
+           , &requests[GET_ONE_HEADER_NO_BODY]
+           , &requests[GET_NO_HEADERS_NO_BODY]
+           );
+
+  printf("request scan 2/4      ");
+  test_scan( &requests[POST_CHUNKED_ALL_YOUR_BASE]
+           , &requests[POST_IDENTITY_BODY_WORLD]
+           , &requests[GET_FUNKY_CONTENT_LENGTH]
+           );
+
+  printf("request scan 3/4      ");
+  test_scan( &requests[TWO_CHUNKS_MULT_ZERO_END]
+           , &requests[CHUNKED_W_TRAILING_HEADERS]
+           , &requests[CHUNKED_W_BULLSHIT_AFTER_LENGTH]
+           );
+
+  printf("request scan 4/4      ");
+  test_scan( &requests[QUERY_URL_WITH_QUESTION_MARK_GET]
+           , &requests[PREFIX_NEWLINE_GET ]
+           , &requests[CONNECT_REQUEST]
+           );
+
+  puts("requests okay");
+
+  return 0;
+}
diff --git a/external/qhttpserver/http-parser/url_parser.c b/external/qhttpserver/http-parser/url_parser.c
new file mode 100755
index 0000000..b1f9c97
--- /dev/null
+++ b/external/qhttpserver/http-parser/url_parser.c
@@ -0,0 +1,44 @@
+#include "http_parser.h"
+#include <stdio.h>
+#include <string.h>
+
+void
+dump_url (const char *url, const struct http_parser_url *u)
+{
+  unsigned int i;
+
+  printf("\tfield_set: 0x%x, port: %u\n", u->field_set, u->port);
+  for (i = 0; i < UF_MAX; i++) {
+    if ((u->field_set & (1 << i)) == 0) {
+      printf("\tfield_data[%u]: unset\n", i);
+      continue;
+    }
+
+    printf("\tfield_data[%u]: off: %u len: %u part: \"%.*s\n",
+           i,
+           u->field_data[i].off,
+           u->field_data[i].len,
+           u->field_data[i].len,
+           url + u->field_data[i].off);
+  }
+}
+
+int main(int argc, char ** argv) {
+  if (argc != 3) {
+    printf("Syntax : %s connect|get url\n", argv[0]);
+    return 1;
+  }
+  struct http_parser_url u;
+  int len = strlen(argv[2]);
+  int connect = strcmp("connect", argv[1]) == 0 ? 1 : 0;
+  printf("Parsing %s, connect %d\n", argv[2], connect);
+
+  int result = http_parser_parse_url(argv[2], len, connect, &u);
+  if (result != 0) {
+    printf("Parse error : %d\n", result);
+    return result;
+  }
+  printf("Parse ok, result : \n");
+  dump_url(argv[2], &u);
+  return 0;
+}
\ No newline at end of file
diff --git a/external/qhttpserver/konvergo-error.patch b/external/qhttpserver/konvergo-error.patch
new file mode 100644
index 0000000..17a9eed
--- /dev/null
+++ b/external/qhttpserver/konvergo-error.patch
@@ -0,0 +1,46 @@
+diff --git a/external/qhttpserver/src/qhttpserver.cpp b/external/qhttpserver/src/qhttpserver.cpp
+index 07e4a85..507645d 100755
+--- a/external/qhttpserver/src/qhttpserver.cpp
++++ b/external/qhttpserver/src/qhttpserver.cpp
+@@ -115,6 +115,7 @@ bool QHttpServer::listen(const QHostAddress &address, quint16 port)
+     if (couldBindToPort) {
+         connect(m_tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
+     } else {
++        m_errorString = m_tcpServer->errorString();
+         delete m_tcpServer;
+         m_tcpServer = NULL;
+     }
+@@ -126,6 +127,11 @@ bool QHttpServer::listen(quint16 port)
+     return listen(QHostAddress::Any, port);
+ }
+ 
++QString QHttpServer::errorString() const
++{
++    return m_errorString;
++}
++
+ void QHttpServer::close()
+ {
+     if (m_tcpServer)
+diff --git a/external/qhttpserver/src/qhttpserver.h b/external/qhttpserver/src/qhttpserver.h
+index a3cb74b..4adb391 100755
+--- a/external/qhttpserver/src/qhttpserver.h
++++ b/external/qhttpserver/src/qhttpserver.h
+@@ -79,6 +79,9 @@ public:
+         @sa listen(const QHostAddress&, quint16) */
+     bool listen(quint16 port);
+ 
++    /// Return the last error encountered.
++    QString errorString() const;
++
+     /// Stop the server and listening for new connections.
+     void close();
+ signals:
+@@ -94,6 +97,7 @@ private slots:
+ 
+ private:
+     QTcpServer *m_tcpServer;
++    QString m_errorString;
+ };
+ 
+ #endif
diff --git a/external/qhttpserver/qhttpserver.pri b/external/qhttpserver/qhttpserver.pri
new file mode 100755
index 0000000..28e801c
--- /dev/null
+++ b/external/qhttpserver/qhttpserver.pri
@@ -0,0 +1,3 @@
+isEmpty(PREFIX):PREFIX = /usr/local
+isEmpty(LIBDIR):LIBDIR = $${PREFIX}/lib
+isEmpty(INCLUDEDIR):INCLUDEDIR = $${PREFIX}/include
diff --git a/external/qhttpserver/qhttpserver.pro b/external/qhttpserver/qhttpserver.pro
new file mode 100755
index 0000000..7fa2161
--- /dev/null
+++ b/external/qhttpserver/qhttpserver.pro
@@ -0,0 +1,8 @@
+CONFIG += ordered
+
+TEMPLATE = subdirs
+
+SUBDIRS += src \
+           examples
+
+examples.depends = src
diff --git a/external/qhttpserver/src/qhttpconnection.cpp b/external/qhttpserver/src/qhttpconnection.cpp
new file mode 100755
index 0000000..bfae140
--- /dev/null
+++ b/external/qhttpserver/src/qhttpconnection.cpp
@@ -0,0 +1,293 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "qhttpconnection.h"
+
+#include <QTcpSocket>
+#include <QHostAddress>
+
+#include "http_parser.h"
+#include "qhttprequest.h"
+#include "qhttpresponse.h"
+
+/// @cond nodoc
+
+QHttpConnection::QHttpConnection(QTcpSocket *socket, QObject *parent)
+    : QObject(parent),
+      m_socket(socket),
+      m_parser(0),
+      m_parserSettings(0),
+      m_request(0),
+      m_transmitLen(0),
+      m_transmitPos(0)
+{
+    m_parser = (http_parser *)malloc(sizeof(http_parser));
+    http_parser_init(m_parser, HTTP_REQUEST);
+
+    m_parserSettings = new http_parser_settings();
+    m_parserSettings->on_message_begin = MessageBegin;
+    m_parserSettings->on_url = Url;
+    m_parserSettings->on_header_field = HeaderField;
+    m_parserSettings->on_header_value = HeaderValue;
+    m_parserSettings->on_headers_complete = HeadersComplete;
+    m_parserSettings->on_body = Body;
+    m_parserSettings->on_message_complete = MessageComplete;
+
+    m_parser->data = this;
+
+    connect(socket, SIGNAL(readyRead()), this, SLOT(parseRequest()));
+    connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
+    connect(socket, SIGNAL(bytesWritten(qint64)), this, SLOT(updateWriteCount(qint64)));
+}
+
+QHttpConnection::~QHttpConnection()
+{
+    m_socket = 0;
+
+    free(m_parser);
+    m_parser = 0;
+
+    delete m_parserSettings;
+    m_parserSettings = 0;
+}
+
+void QHttpConnection::socketDisconnected()
+{
+    deleteLater();
+
+    if (m_request) {
+        if (m_request->successful())
+            return;
+
+        m_request->setSuccessful(false);
+        Q_EMIT m_request->end();
+    }
+}
+
+void QHttpConnection::updateWriteCount(qint64 count)
+{
+    Q_ASSERT(m_transmitPos + count <= m_transmitLen);
+
+    m_transmitPos += count;
+
+    if (m_transmitPos == m_transmitLen)
+    {
+        m_transmitLen = 0;
+        m_transmitPos = 0;
+        Q_EMIT allBytesWritten();
+    }
+}
+
+void QHttpConnection::parseRequest()
+{
+    Q_ASSERT(m_parser);
+
+    while (m_socket->bytesAvailable()) {
+        QByteArray arr = m_socket->readAll();
+        http_parser_execute(m_parser, m_parserSettings, arr.constData(), arr.size());
+    }
+}
+
+void QHttpConnection::write(const QByteArray &data)
+{
+    m_socket->write(data);
+    m_transmitLen += data.size();
+}
+
+void QHttpConnection::flush()
+{
+    m_socket->flush();
+}
+
+void QHttpConnection::waitForBytesWritten()
+{
+    m_socket->waitForBytesWritten();
+}
+
+void QHttpConnection::responseDone()
+{
+    QHttpResponse *response = qobject_cast<QHttpResponse *>(QObject::sender());
+    if (response->m_last)
+        m_socket->disconnectFromHost();
+}
+
+/* URL Utilities */
+#define HAS_URL_FIELD(info, field) (info.field_set &(1 << (field)))
+
+#define GET_FIELD(data, info, field)                                                               \
+    QString::fromLatin1(data + info.field_data[field].off, info.field_data[field].len)
+
+#define CHECK_AND_GET_FIELD(data, info, field)                                                     \
+    (HAS_URL_FIELD(info, field) ? GET_FIELD(data, info, field) : QString())
+
+QUrl createUrl(const char *urlData, const http_parser_url &urlInfo)
+{
+    QUrl url;
+    url.setScheme(CHECK_AND_GET_FIELD(urlData, urlInfo, UF_SCHEMA));
+    url.setHost(CHECK_AND_GET_FIELD(urlData, urlInfo, UF_HOST));
+    // Port is dealt with separately since it is available as an integer.
+    url.setPath(CHECK_AND_GET_FIELD(urlData, urlInfo, UF_PATH));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    url.setQuery(CHECK_AND_GET_FIELD(urlData, urlInfo, UF_QUERY));
+#else
+    if (HAS_URL_FIELD(urlInfo, UF_QUERY)) {
+        url.setEncodedQuery(QByteArray(urlData + urlInfo.field_data[UF_QUERY].off,
+                                       urlInfo.field_data[UF_QUERY].len));
+    }
+#endif
+    url.setFragment(CHECK_AND_GET_FIELD(urlData, urlInfo, UF_FRAGMENT));
+    url.setUserInfo(CHECK_AND_GET_FIELD(urlData, urlInfo, UF_USERINFO));
+
+    if (HAS_URL_FIELD(urlInfo, UF_PORT))
+        url.setPort(urlInfo.port);
+
+    return url;
+}
+
+#undef CHECK_AND_SET_FIELD
+#undef GET_FIELD
+#undef HAS_URL_FIELD
+
+/********************
+ * Static Callbacks *
+ *******************/
+
+int QHttpConnection::MessageBegin(http_parser *parser)
+{
+    QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
+    theConnection->m_currentHeaders.clear();
+    theConnection->m_currentUrl.clear();
+    theConnection->m_currentUrl.reserve(128);
+
+    // The QHttpRequest should not be parented to this, since it's memory
+    // management is the responsibility of the user of the library.
+    theConnection->m_request = new QHttpRequest(theConnection);
+    return 0;
+}
+
+int QHttpConnection::HeadersComplete(http_parser *parser)
+{
+    QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
+    Q_ASSERT(theConnection->m_request);
+
+    /** set method **/
+    theConnection->m_request->setMethod(static_cast<QHttpRequest::HttpMethod>(parser->method));
+
+    /** set version **/
+    theConnection->m_request->setVersion(
+        QString("%1.%2").arg(parser->http_major).arg(parser->http_minor));
+
+    /** get parsed url **/
+    struct http_parser_url urlInfo;
+    int r = http_parser_parse_url(theConnection->m_currentUrl.constData(),
+                                  theConnection->m_currentUrl.size(),
+                                  parser->method == HTTP_CONNECT, &urlInfo);
+    Q_ASSERT(r == 0);
+    Q_UNUSED(r);
+
+    theConnection->m_request->setUrl(createUrl(theConnection->m_currentUrl.constData(), urlInfo));
+
+    // Insert last remaining header
+    theConnection->m_currentHeaders[theConnection->m_currentHeaderField.toLower()] =
+        theConnection->m_currentHeaderValue;
+    theConnection->m_request->setHeaders(theConnection->m_currentHeaders);
+
+    /** set client information **/
+    theConnection->m_request->m_remoteAddress = theConnection->m_socket->peerAddress().toString();
+    theConnection->m_request->m_remotePort = theConnection->m_socket->peerPort();
+
+    QHttpResponse *response = new QHttpResponse(theConnection);
+    if (parser->http_major < 1 || parser->http_minor < 1)
+        response->m_keepAlive = false;
+
+    connect(theConnection, SIGNAL(destroyed()), response, SLOT(connectionClosed()));
+    connect(response, SIGNAL(done()), theConnection, SLOT(responseDone()));
+
+    // we are good to go!
+    Q_EMIT theConnection->newRequest(theConnection->m_request, response);
+    return 0;
+}
+
+int QHttpConnection::MessageComplete(http_parser *parser)
+{
+    // TODO: do cleanup and prepare for next request
+    QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
+    Q_ASSERT(theConnection->m_request);
+
+    theConnection->m_request->setSuccessful(true);
+    Q_EMIT theConnection->m_request->end();
+    return 0;
+}
+
+int QHttpConnection::Url(http_parser *parser, const char *at, size_t length)
+{
+    QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
+    Q_ASSERT(theConnection->m_request);
+
+    theConnection->m_currentUrl.append(at, length);
+    return 0;
+}
+
+int QHttpConnection::HeaderField(http_parser *parser, const char *at, size_t length)
+{
+    QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
+    Q_ASSERT(theConnection->m_request);
+
+    // insert the header we parsed previously
+    // into the header map
+    if (!theConnection->m_currentHeaderField.isEmpty() &&
+        !theConnection->m_currentHeaderValue.isEmpty()) {
+        // header names are always lower-cased
+        theConnection->m_currentHeaders[theConnection->m_currentHeaderField.toLower()] =
+            theConnection->m_currentHeaderValue;
+        // clear header value. this sets up a nice
+        // feedback loop where the next time
+        // HeaderValue is called, it can simply append
+        theConnection->m_currentHeaderField = QString();
+        theConnection->m_currentHeaderValue = QString();
+    }
+
+    QString fieldSuffix = QString::fromLatin1(at, length);
+    theConnection->m_currentHeaderField += fieldSuffix;
+    return 0;
+}
+
+int QHttpConnection::HeaderValue(http_parser *parser, const char *at, size_t length)
+{
+    QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
+    Q_ASSERT(theConnection->m_request);
+
+    QString valueSuffix = QString::fromLatin1(at, length);
+    theConnection->m_currentHeaderValue += valueSuffix;
+    return 0;
+}
+
+int QHttpConnection::Body(http_parser *parser, const char *at, size_t length)
+{
+    QHttpConnection *theConnection = static_cast<QHttpConnection *>(parser->data);
+    Q_ASSERT(theConnection->m_request);
+
+    Q_EMIT theConnection->m_request->data(QByteArray(at, length));
+    return 0;
+}
+
+/// @endcond
diff --git a/external/qhttpserver/src/qhttpconnection.h b/external/qhttpserver/src/qhttpconnection.h
new file mode 100755
index 0000000..6a9f5eb
--- /dev/null
+++ b/external/qhttpserver/src/qhttpconnection.h
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef Q_HTTP_CONNECTION
+#define Q_HTTP_CONNECTION
+
+#include "qhttpserverapi.h"
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+
+/// @cond nodoc
+
+class QHTTPSERVER_API QHttpConnection : public QObject
+{
+    Q_OBJECT
+
+public:
+    QHttpConnection(QTcpSocket *socket, QObject *parent = 0);
+    virtual ~QHttpConnection();
+
+    void write(const QByteArray &data);
+    void flush();
+    void waitForBytesWritten();
+
+Q_SIGNALS:
+    void newRequest(QHttpRequest *, QHttpResponse *);
+    void allBytesWritten();
+
+private Q_SLOTS:
+    void parseRequest();
+    void responseDone();
+    void socketDisconnected();
+    void updateWriteCount(qint64);
+
+private:
+    static int MessageBegin(http_parser *parser);
+    static int Url(http_parser *parser, const char *at, size_t length);
+    static int HeaderField(http_parser *parser, const char *at, size_t length);
+    static int HeaderValue(http_parser *parser, const char *at, size_t length);
+    static int HeadersComplete(http_parser *parser);
+    static int Body(http_parser *parser, const char *at, size_t length);
+    static int MessageComplete(http_parser *parser);
+
+private:
+    QTcpSocket *m_socket;
+    http_parser *m_parser;
+    http_parser_settings *m_parserSettings;
+
+    // Since there can only be one request at any time even with pipelining.
+    QHttpRequest *m_request;
+
+    QByteArray m_currentUrl;
+    // The ones we are reading in from the parser
+    HeaderHash m_currentHeaders;
+    QString m_currentHeaderField;
+    QString m_currentHeaderValue;
+
+    // Keep track of transmit buffer status
+    qint64 m_transmitLen;
+    qint64 m_transmitPos;
+};
+
+/// @endcond
+
+#endif
diff --git a/external/qhttpserver/src/qhttprequest.cpp b/external/qhttpserver/src/qhttprequest.cpp
new file mode 100755
index 0000000..ea0765a
--- /dev/null
+++ b/external/qhttpserver/src/qhttprequest.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "qhttprequest.h"
+
+#include "qhttpconnection.h"
+
+QHttpRequest::QHttpRequest(QHttpConnection *connection, QObject *parent)
+    : QObject(parent), m_connection(connection), m_url("http://localhost/"), m_success(false)
+{
+}
+
+QHttpRequest::~QHttpRequest()
+{
+}
+
+QString QHttpRequest::header(const QString &field)
+{
+    return m_headers.value(field.toLower(), "");
+}
+
+const HeaderHash &QHttpRequest::headers() const
+{
+    return m_headers;
+}
+
+const QString &QHttpRequest::httpVersion() const
+{
+    return m_version;
+}
+
+const QUrl &QHttpRequest::url() const
+{
+    return m_url;
+}
+
+const QString QHttpRequest::path() const
+{
+    return m_url.path();
+}
+
+const QString QHttpRequest::methodString() const
+{
+    return MethodToString(method());
+}
+
+QHttpRequest::HttpMethod QHttpRequest::method() const
+{
+    return m_method;
+}
+
+const QString &QHttpRequest::remoteAddress() const
+{
+    return m_remoteAddress;
+}
+
+quint16 QHttpRequest::remotePort() const
+{
+    return m_remotePort;
+}
+
+void QHttpRequest::storeBody()
+{
+    connect(this, SIGNAL(data(const QByteArray &)), this, SLOT(appendBody(const QByteArray &)),
+            Qt::UniqueConnection);
+}
+
+QString QHttpRequest::MethodToString(HttpMethod method)
+{
+    int index = staticMetaObject.indexOfEnumerator("HttpMethod");
+    return staticMetaObject.enumerator(index).valueToKey(method);
+}
+
+void QHttpRequest::appendBody(const QByteArray &body)
+{
+    m_body.append(body);
+}
diff --git a/external/qhttpserver/src/qhttprequest.h b/external/qhttpserver/src/qhttprequest.h
new file mode 100755
index 0000000..4f9cc3b
--- /dev/null
+++ b/external/qhttpserver/src/qhttprequest.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef Q_HTTP_REQUEST
+#define Q_HTTP_REQUEST
+
+#include "qhttpserverapi.h"
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+#include <QMetaEnum>
+#include <QMetaType>
+#include <QUrl>
+
+/// The QHttpRequest class represents the header and body data sent by the client.
+/** The requests header data is available immediately. Body data is streamed as
+    it comes in via the data() signal. As a consequence the application's request
+    callback should ensure that it connects to the data() signal before control
+    returns back to the event loop. Otherwise there is a risk of some data never
+    being received by the application.
+
+    The class is <b>read-only</b>. */
+class QHTTPSERVER_API QHttpRequest : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(HeaderHash headers READ headers)
+    Q_PROPERTY(QString remoteAddress READ remoteAddress)
+    Q_PROPERTY(quint16 remotePort READ remotePort)
+    Q_PROPERTY(QString method READ method)
+    Q_PROPERTY(QUrl url READ url)
+    Q_PROPERTY(QString path READ path)
+    Q_PROPERTY(QString httpVersion READ httpVersion)
+
+    Q_ENUMS(HttpMethod)
+
+    /// @cond nodoc
+    friend class QHttpConnection;
+    /// @endcond
+
+public:
+    virtual ~QHttpRequest();
+
+    /// Request method enumeration.
+    /** @note Taken from http_parser.h -- make sure to keep synced */
+    enum HttpMethod {
+        HTTP_DELETE = 0,
+        HTTP_GET,
+        HTTP_HEAD,
+        HTTP_POST,
+        HTTP_PUT,
+        // pathological
+        HTTP_CONNECT,
+        HTTP_OPTIONS,
+        HTTP_TRACE,
+        // webdav
+        HTTP_COPY,
+        HTTP_LOCK,
+        HTTP_MKCOL,
+        HTTP_MOVE,
+        HTTP_PROPFIND,
+        HTTP_PROPPATCH,
+        HTTP_SEARCH,
+        HTTP_UNLOCK,
+        // subversion
+        HTTP_REPORT,
+        HTTP_MKACTIVITY,
+        HTTP_CHECKOUT,
+        HTTP_MERGE,
+        // upnp
+        HTTP_MSEARCH,
+        HTTP_NOTIFY,
+        HTTP_SUBSCRIBE,
+        HTTP_UNSUBSCRIBE,
+        // RFC-5789
+        HTTP_PATCH,
+        HTTP_PURGE
+    };
+
+    /// The method used for the request.
+    HttpMethod method() const;
+
+    /// Returns the method string for the request.
+    /** @note This will plainly transform the enum into a string HTTP_GET -> "HTTP_GET". */
+    const QString methodString() const;
+
+    /// The complete URL for the request.
+    /** This includes the path and query string.
+        @sa path() */
+    const QUrl &url() const;
+
+    /// The path portion of the query URL.
+    /** @sa url() */
+    const QString path() const;
+
+    /// The HTTP version of the request.
+    /** @return A string in the form of "x.x" */
+    const QString &httpVersion() const;
+
+    /// Return all the headers sent by the client.
+    /** This returns a reference. If you want to store headers
+        somewhere else, where the request may be deleted,
+        make sure you store them as a copy.
+        @note All header names are <b>lowercase</b>
+        so that Content-Length becomes content-length etc. */
+    const HeaderHash &headers() const;
+
+    /// Get the value of a header.
+    /** Headers are stored as lowercase so the input @c field will be lowercased.
+        @param field Name of the header field
+        @return Value of the header or empty string if not found. */
+    QString header(const QString &field);
+
+    /// IP Address of the client in dotted decimal format.
+    const QString &remoteAddress() const;
+
+    /// Outbound connection port for the client.
+    quint16 remotePort() const;
+
+    /// Request body data, empty for non POST/PUT requests.
+    /** @sa storeBody() */
+    const QByteArray &body() const
+    {
+        return m_body;
+    }
+
+    /// If this request was successfully received.
+    /** Set before end() has been emitted, stating whether
+        the message was properly received. This is false
+        until the receiving the full request has completed. */
+    bool successful() const
+    {
+        return m_success;
+    }
+
+    /// Utility function to make this request store all body data internally.
+    /** If you call this when the request is received via QHttpServer::newRequest()
+        the request will take care of storing the body data for you.
+        Once the end() signal is emitted you can access the body data with
+        the body() function.
+
+        If you wish to handle incoming data yourself don't call this function
+        and see the data() signal.
+        @sa data() body() */
+    void storeBody();
+
+Q_SIGNALS:
+    /// Emitted when new body data has been received.
+    /** @note This may be emitted zero or more times
+        depending on the request type.
+        @param data Received data. */
+    void data(const QByteArray &data);
+
+    /// Emitted when the request has been fully received.
+    /** @note The no more data() signals will be emitted after this. */
+    void end();
+
+private Q_SLOTS:
+    void appendBody(const QByteArray &body);
+
+private:
+    QHttpRequest(QHttpConnection *connection, QObject *parent = 0);
+
+    static QString MethodToString(HttpMethod method);
+
+    void setMethod(HttpMethod method) { m_method = method; }
+    void setVersion(const QString &version) { m_version = version; }
+    void setUrl(const QUrl &url) { m_url = url; }
+    void setHeaders(const HeaderHash headers) { m_headers = headers; }
+    void setSuccessful(bool success) { m_success = success; }
+
+    QHttpConnection *m_connection;
+    HeaderHash m_headers;
+    HttpMethod m_method;
+    QUrl m_url;
+    QString m_version;
+    QString m_remoteAddress;
+    quint16 m_remotePort;
+    QByteArray m_body;
+    bool m_success;
+};
+
+#endif
diff --git a/external/qhttpserver/src/qhttpresponse.cpp b/external/qhttpserver/src/qhttpresponse.cpp
new file mode 100755
index 0000000..39367a4
--- /dev/null
+++ b/external/qhttpserver/src/qhttpresponse.cpp
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "qhttpresponse.h"
+
+#include <QDateTime>
+#include <QLocale>
+
+#include "qhttpserver.h"
+#include "qhttpconnection.h"
+
+QHttpResponse::QHttpResponse(QHttpConnection *connection)
+    // TODO: parent child relation
+    : QObject(0),
+      m_connection(connection),
+      m_headerWritten(false),
+      m_sentConnectionHeader(false),
+      m_sentContentLengthHeader(false),
+      m_sentTransferEncodingHeader(false),
+      m_sentDate(false),
+      m_keepAlive(true),
+      m_last(false),
+      m_useChunkedEncoding(false),
+      m_finished(false)
+{
+   connect(m_connection, SIGNAL(allBytesWritten()), this, SIGNAL(allBytesWritten()));
+}
+
+QHttpResponse::~QHttpResponse()
+{
+}
+
+void QHttpResponse::setHeader(const QString &field, const QString &value)
+{
+    if (!m_finished)
+        m_headers[field] = value;
+    else
+        qWarning() << "QHttpResponse::setHeader() Cannot set headers after response has finished.";
+}
+
+void QHttpResponse::writeHeader(const char *field, const QString &value)
+{
+    if (!m_finished) {
+        m_connection->write(field);
+        m_connection->write(": ");
+        m_connection->write(value.toUtf8());
+        m_connection->write("\r\n");
+    } else
+        qWarning()
+            << "QHttpResponse::writeHeader() Cannot write headers after response has finished.";
+}
+
+void QHttpResponse::writeHeaders()
+{
+    if (m_finished)
+        return;
+
+    foreach(const QString & name, m_headers.keys()) {
+        QString value = m_headers[name];
+        if (name.compare("connection", Qt::CaseInsensitive) == 0) {
+            m_sentConnectionHeader = true;
+            if (value.compare("close", Qt::CaseInsensitive) == 0)
+                m_last = true;
+            else
+                m_keepAlive = true;
+        } else if (name.compare("transfer-encoding", Qt::CaseInsensitive) == 0) {
+            m_sentTransferEncodingHeader = true;
+            if (value.compare("chunked", Qt::CaseInsensitive) == 0)
+                m_useChunkedEncoding = true;
+        } else if (name.compare("content-length", Qt::CaseInsensitive) == 0)
+            m_sentContentLengthHeader = true;
+        else if (name.compare("date", Qt::CaseInsensitive) == 0)
+            m_sentDate = true;
+
+        /// @todo Expect case (??)
+
+        writeHeader(name.toLatin1(), value.toLatin1());
+    }
+
+    if (!m_sentConnectionHeader) {
+        if (m_keepAlive && (m_sentContentLengthHeader || m_useChunkedEncoding)) {
+            writeHeader("Connection", "keep-alive");
+        } else {
+            m_last = true;
+            writeHeader("Connection", "close");
+        }
+    }
+
+    if (!m_sentContentLengthHeader && !m_sentTransferEncodingHeader) {
+        if (m_useChunkedEncoding)
+            writeHeader("Transfer-Encoding", "chunked");
+        else
+            m_last = true;
+    }
+
+    // Sun, 06 Nov 1994 08:49:37 GMT - RFC 822. Use QLocale::c() so english is used for month and
+    // day.
+    if (!m_sentDate)
+        writeHeader("Date",
+                    QLocale::c().toString(QDateTime::currentDateTimeUtc(),
+                                          "ddd, dd MMM yyyy hh:mm:ss") + " GMT");
+}
+
+void QHttpResponse::writeHead(int status)
+{
+    if (m_finished) {
+        qWarning()
+            << "QHttpResponse::writeHead() Cannot write headers after response has finished.";
+        return;
+    }
+
+    if (m_headerWritten) {
+        qWarning() << "QHttpResponse::writeHead() Already called once for this response.";
+        return;
+    }
+
+    m_connection->write(
+        QString("HTTP/1.1 %1 %2\r\n").arg(status).arg(STATUS_CODES[status]).toLatin1());
+    writeHeaders();
+    m_connection->write("\r\n");
+
+    m_headerWritten = true;
+}
+
+void QHttpResponse::writeHead(StatusCode statusCode)
+{
+    writeHead(static_cast<int>(statusCode));
+}
+
+void QHttpResponse::write(const QByteArray &data)
+{
+    if (m_finished) {
+        qWarning() << "QHttpResponse::write() Cannot write body after response has finished.";
+        return;
+    }
+
+    if (!m_headerWritten) {
+        qWarning() << "QHttpResponse::write() You must call writeHead() before writing body data.";
+        return;
+    }
+
+    m_connection->write(data);
+}
+
+void QHttpResponse::flush()
+{
+    m_connection->flush();
+}
+
+void QHttpResponse::waitForBytesWritten()
+{
+    m_connection->waitForBytesWritten();
+}
+
+void QHttpResponse::end(const QByteArray &data)
+{
+    if (m_finished) {
+        qWarning() << "QHttpResponse::end() Cannot write end after response has finished.";
+        return;
+    }
+
+    if (data.size() > 0)
+        write(data);
+    m_finished = true;
+
+    Q_EMIT done();
+
+    /// @todo End connection and delete ourselves. Is this a still valid note?
+    deleteLater();
+}
+
+void QHttpResponse::connectionClosed()
+{
+    m_finished = true;
+    Q_EMIT done();
+    deleteLater();
+}
diff --git a/external/qhttpserver/src/qhttpresponse.h b/external/qhttpserver/src/qhttpresponse.h
new file mode 100755
index 0000000..fcf5897
--- /dev/null
+++ b/external/qhttpserver/src/qhttpresponse.h
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef Q_HTTP_RESPONSE
+#define Q_HTTP_RESPONSE
+
+#include "qhttpserverapi.h"
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+
+/// The QHttpResponse class handles sending data back to the client as a response to a request.
+/** The steps to respond correctly are
+    <ol>
+        <li>Call setHeader() to set headers [optional]</li>
+        <li>Call writeHead() with the HTTP status code</li>
+        <li>Call write() zero or more times for body data.</li>
+        <li>Call end() when the resonse can be sent back</li>
+    </ol> */
+class QHTTPSERVER_API QHttpResponse : public QObject
+{
+    Q_OBJECT
+
+public:
+    /// HTTP status code.
+    enum StatusCode {
+        STATUS_CONTINUE = 100,
+        STATUS_SWITCH_PROTOCOLS = 101,
+        STATUS_OK = 200,
+        STATUS_CREATED = 201,
+        STATUS_ACCEPTED = 202,
+        STATUS_NON_AUTHORITATIVE_INFORMATION = 203,
+        STATUS_NO_CONTENT = 204,
+        STATUS_RESET_CONTENT = 205,
+        STATUS_PARTIAL_CONTENT = 206,
+        STATUS_MULTIPLE_CHOICES = 300,
+        STATUS_MOVED_PERMANENTLY = 301,
+        STATUS_FOUND = 302,
+        STATUS_SEE_OTHER = 303,
+        STATUS_NOT_MODIFIED = 304,
+        STATUS_USE_PROXY = 305,
+        STATUS_TEMPORARY_REDIRECT = 307,
+        STATUS_BAD_REQUEST = 400,
+        STATUS_UNAUTHORIZED = 401,
+        STATUS_PAYMENT_REQUIRED = 402,
+        STATUS_FORBIDDEN = 403,
+        STATUS_NOT_FOUND = 404,
+        STATUS_METHOD_NOT_ALLOWED = 405,
+        STATUS_NOT_ACCEPTABLE = 406,
+        STATUS_PROXY_AUTHENTICATION_REQUIRED = 407,
+        STATUS_REQUEST_TIMEOUT = 408,
+        STATUS_CONFLICT = 409,
+        STATUS_GONE = 410,
+        STATUS_LENGTH_REQUIRED = 411,
+        STATUS_PRECONDITION_FAILED = 412,
+        STATUS_REQUEST_ENTITY_TOO_LARGE = 413,
+        STATUS_REQUEST_URI_TOO_LONG = 414,
+        STATUS_REQUEST_UNSUPPORTED_MEDIA_TYPE = 415,
+        STATUS_REQUESTED_RANGE_NOT_SATISFIABLE = 416,
+        STATUS_EXPECTATION_FAILED = 417,
+        STATUS_INTERNAL_SERVER_ERROR = 500,
+        STATUS_NOT_IMPLEMENTED = 501,
+        STATUS_BAD_GATEWAY = 502,
+        STATUS_SERVICE_UNAVAILABLE = 503,
+        STATUS_GATEWAY_TIMEOUT = 504,
+        STATUS_HTTP_VERSION_NOT_SUPPORTED = 505
+    };
+
+    virtual ~QHttpResponse();
+
+    /// @cond nodoc
+    friend class QHttpConnection;
+    /// @endcond
+
+public Q_SLOTS:
+    /// Sets a response header @c field to @c value.
+    /** @note You must call this with all your custom headers
+        before calling writeHead(), write() or end().
+        @param field Header field to be set.
+        @param value Header value to be set. */
+    void setHeader(const QString &field, const QString &value);
+
+    /// Writes the header section of the response
+    /// using @c status as the response status code.
+    /** @param statusCode Status code for the response.
+        @note Any headers should be set before
+        invoking this function with setHeader(). */
+    void writeHead(int statusCode);
+
+    /** @overload */
+    void writeHead(StatusCode statusCode);
+
+    /// Writes a block of @c data to the client.
+    /** @note writeHead() must be called before this function. */
+    void write(const QByteArray &data);
+
+    /// Flushes the written data to the client.
+    /** @note writeHead() must be called before this function. */
+    void flush();
+
+    /// Waiting for bytes to be written. See QAbstractSocket::waitForBytesWritten in the Qt documentation
+    /** @note writeHead() must be called before this function. */
+    void waitForBytesWritten();
+
+    /// End/finish the response.
+    /** Data will be flushed to the underlying socket
+        and the connection itself will be closed if
+        this is the last response.
+
+        This will emit done() and queue this object
+        for deletion. For details see \ref memorymanagement.
+        @param data Optional data to be written before finishing. */
+    void end(const QByteArray &data = "");
+
+Q_SIGNALS:
+    /// Emitted when all the data has been sent
+    /** This signal indicates that the underlaying socket has transmitted all
+        of it's buffered data. It is possible to implement memory-efficient
+        file transfers by calling \ref write() for a block of data only after
+        receiving this signal. */
+    void allBytesWritten();
+
+    /// Emitted when the response is finished.
+    /** You should <b>not</b> interact with this object
+        after done() has been emitted as the object
+        has already been scheduled for deletion. */
+    void done();
+
+private:
+    QHttpResponse(QHttpConnection *connection);
+
+    void writeHeaders();
+    void writeHeader(const char *field, const QString &value);
+
+    QHttpConnection *m_connection;
+
+    HeaderHash m_headers;
+
+    bool m_headerWritten;
+    bool m_sentConnectionHeader;
+    bool m_sentContentLengthHeader;
+    bool m_sentTransferEncodingHeader;
+    bool m_sentDate;
+    bool m_keepAlive;
+    bool m_last;
+    bool m_useChunkedEncoding;
+    bool m_finished;
+
+private Q_SLOTS:
+    void connectionClosed();
+};
+
+#endif
diff --git a/external/qhttpserver/src/qhttpserver.cpp b/external/qhttpserver/src/qhttpserver.cpp
new file mode 100755
index 0000000..507645d
--- /dev/null
+++ b/external/qhttpserver/src/qhttpserver.cpp
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "qhttpserver.h"
+
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QVariant>
+#include <QDebug>
+
+#include "qhttpconnection.h"
+
+QHash<int, QString> STATUS_CODES;
+
+QHttpServer::QHttpServer(QObject *parent) : QObject(parent), m_tcpServer(0)
+{
+#define STATUS_CODE(num, reason) STATUS_CODES.insert(num, reason);
+    // {{{
+    STATUS_CODE(100, "Continue")
+    STATUS_CODE(101, "Switching Protocols")
+    STATUS_CODE(102, "Processing") // RFC 2518) obsoleted by RFC 4918
+    STATUS_CODE(200, "OK")
+    STATUS_CODE(201, "Created")
+    STATUS_CODE(202, "Accepted")
+    STATUS_CODE(203, "Non-Authoritative Information")
+    STATUS_CODE(204, "No Content")
+    STATUS_CODE(205, "Reset Content")
+    STATUS_CODE(206, "Partial Content")
+    STATUS_CODE(207, "Multi-Status") // RFC 4918
+    STATUS_CODE(300, "Multiple Choices")
+    STATUS_CODE(301, "Moved Permanently")
+    STATUS_CODE(302, "Moved Temporarily")
+    STATUS_CODE(303, "See Other")
+    STATUS_CODE(304, "Not Modified")
+    STATUS_CODE(305, "Use Proxy")
+    STATUS_CODE(307, "Temporary Redirect")
+    STATUS_CODE(400, "Bad Request")
+    STATUS_CODE(401, "Unauthorized")
+    STATUS_CODE(402, "Payment Required")
+    STATUS_CODE(403, "Forbidden")
+    STATUS_CODE(404, "Not Found")
+    STATUS_CODE(405, "Method Not Allowed")
+    STATUS_CODE(406, "Not Acceptable")
+    STATUS_CODE(407, "Proxy Authentication Required")
+    STATUS_CODE(408, "Request Time-out")
+    STATUS_CODE(409, "Conflict")
+    STATUS_CODE(410, "Gone")
+    STATUS_CODE(411, "Length Required")
+    STATUS_CODE(412, "Precondition Failed")
+    STATUS_CODE(413, "Request Entity Too Large")
+    STATUS_CODE(414, "Request-URI Too Large")
+    STATUS_CODE(415, "Unsupported Media Type")
+    STATUS_CODE(416, "Requested Range Not Satisfiable")
+    STATUS_CODE(417, "Expectation Failed")
+    STATUS_CODE(418, "I\"m a teapot")        // RFC 2324
+    STATUS_CODE(422, "Unprocessable Entity") // RFC 4918
+    STATUS_CODE(423, "Locked")               // RFC 4918
+    STATUS_CODE(424, "Failed Dependency")    // RFC 4918
+    STATUS_CODE(425, "Unordered Collection") // RFC 4918
+    STATUS_CODE(426, "Upgrade Required")     // RFC 2817
+    STATUS_CODE(500, "Internal Server Error")
+    STATUS_CODE(501, "Not Implemented")
+    STATUS_CODE(502, "Bad Gateway")
+    STATUS_CODE(503, "Service Unavailable")
+    STATUS_CODE(504, "Gateway Time-out")
+    STATUS_CODE(505, "HTTP Version not supported")
+    STATUS_CODE(506, "Variant Also Negotiates") // RFC 2295
+    STATUS_CODE(507, "Insufficient Storage")    // RFC 4918
+    STATUS_CODE(509, "Bandwidth Limit Exceeded")
+    STATUS_CODE(510, "Not Extended") // RFC 2774
+    // }}}
+}
+
+QHttpServer::~QHttpServer()
+{
+}
+
+void QHttpServer::newConnection()
+{
+    Q_ASSERT(m_tcpServer);
+
+    while (m_tcpServer->hasPendingConnections()) {
+        QHttpConnection *connection =
+            new QHttpConnection(m_tcpServer->nextPendingConnection(), this);
+        connect(connection, SIGNAL(newRequest(QHttpRequest *, QHttpResponse *)), this,
+                SIGNAL(newRequest(QHttpRequest *, QHttpResponse *)));
+    }
+}
+
+bool QHttpServer::listen(const QHostAddress &address, quint16 port)
+{
+    Q_ASSERT(!m_tcpServer);
+    m_tcpServer = new QTcpServer(this);
+
+    bool couldBindToPort = m_tcpServer->listen(address, port);
+    if (couldBindToPort) {
+        connect(m_tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
+    } else {
+        m_errorString = m_tcpServer->errorString();
+        delete m_tcpServer;
+        m_tcpServer = NULL;
+    }
+    return couldBindToPort;
+}
+
+bool QHttpServer::listen(quint16 port)
+{
+    return listen(QHostAddress::Any, port);
+}
+
+QString QHttpServer::errorString() const
+{
+    return m_errorString;
+}
+
+void QHttpServer::close()
+{
+    if (m_tcpServer)
+        m_tcpServer->close();
+}
diff --git a/external/qhttpserver/src/qhttpserver.h b/external/qhttpserver/src/qhttpserver.h
new file mode 100755
index 0000000..c7ed557
--- /dev/null
+++ b/external/qhttpserver/src/qhttpserver.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef Q_HTTP_SERVER
+#define Q_HTTP_SERVER
+
+#define QHTTPSERVER_VERSION_MAJOR 0
+#define QHTTPSERVER_VERSION_MINOR 1
+#define QHTTPSERVER_VERSION_PATCH 0
+
+#include "qhttpserverapi.h"
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+#include <QHostAddress>
+
+/// Maps status codes to string reason phrases
+extern QHash<int, QString> STATUS_CODES;
+
+/// The QHttpServer class forms the basis of the %QHttpServer
+/// project. It is a fast, non-blocking HTTP server.
+/** These are the steps to create a server, handle and respond to requests:
+    <ol>
+        <li>Create an instance of QHttpServer.</li>
+        <li>Connect a slot to the newRequest() signal.</li>
+        <li>Create a QCoreApplication to drive the server event loop.</li>
+        <li>Respond to clients by writing out to the QHttpResponse object.</li>
+    </ol>
+
+    <b>Here is a simple sample application on how to use this library</b>
+
+    helloworld.cpp
+    @include helloworld/helloworld.cpp
+
+    helloworld.h
+    @include helloworld/helloworld.h */
+class QHTTPSERVER_API QHttpServer : public QObject
+{
+    Q_OBJECT
+
+public:
+    /// Construct a new HTTP Server.
+    /** @param parent Parent QObject for the server. */
+    QHttpServer(QObject *parent = 0);
+
+    virtual ~QHttpServer();
+
+    /// Start the server by bounding to the given @c address and @c port.
+    /** @note This function returns immediately, it does not block.
+        @param address Address on which to listen to. Default is to listen on
+        all interfaces which means the server can be accessed from anywhere.
+        @param port Port number on which the server should run.
+        @return True if the server was started successfully, false otherwise.
+        @sa listen(quint16) */
+    bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 80);
+
+    /// Starts the server on @c port listening on all interfaces.
+    /** @param port Port number on which the server should run.
+        @return True if the server was started successfully, false otherwise.
+        @sa listen(const QHostAddress&, quint16) */
+    bool listen(quint16 port);
+
+    /// Return the last error encountered.
+    QString errorString() const;
+
+    /// Stop the server and listening for new connections.
+    void close();
+Q_SIGNALS:
+    /// Emitted when a client makes a new request to the server.
+    /** The slot should use the given @c request and @c response
+        objects to communicate with the client.
+        @param request New incoming request.
+        @param response Response object to the request. */
+    void newRequest(QHttpRequest *request, QHttpResponse *response);
+
+private Q_SLOTS:
+    void newConnection();
+
+private:
+    QTcpServer *m_tcpServer;
+    QString m_errorString;
+};
+
+#endif
diff --git a/external/qhttpserver/src/qhttpserver.h.orig b/external/qhttpserver/src/qhttpserver.h.orig
new file mode 100755
index 0000000..46c5b4b
--- /dev/null
+++ b/external/qhttpserver/src/qhttpserver.h.orig
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef Q_HTTP_SERVER
+#define Q_HTTP_SERVER
+
+#define QHTTPSERVER_VERSION_MAJOR 0
+#define QHTTPSERVER_VERSION_MINOR 1
+#define QHTTPSERVER_VERSION_PATCH 0
+
+#include "qhttpserverapi.h"
+#include "qhttpserverfwd.h"
+
+#include <QObject>
+#include <QHostAddress>
+
+/// Maps status codes to string reason phrases
+extern QHash<int, QString> STATUS_CODES;
+
+/// The QHttpServer class forms the basis of the %QHttpServer
+/// project. It is a fast, non-blocking HTTP server.
+/** These are the steps to create a server, handle and respond to requests:
+    <ol>
+        <li>Create an instance of QHttpServer.</li>
+        <li>Connect a slot to the newRequest() signal.</li>
+        <li>Create a QCoreApplication to drive the server event loop.</li>
+        <li>Respond to clients by writing out to the QHttpResponse object.</li>
+    </ol>
+
+    <b>Here is a simple sample application on how to use this library</b>
+
+    helloworld.cpp
+    @include helloworld/helloworld.cpp
+
+    helloworld.h
+    @include helloworld/helloworld.h */
+class QHTTPSERVER_API QHttpServer : public QObject
+{
+    Q_OBJECT
+
+public:
+    /// Construct a new HTTP Server.
+    /** @param parent Parent QObject for the server. */
+    QHttpServer(QObject *parent = 0);
+
+    virtual ~QHttpServer();
+
+    /// Start the server by bounding to the given @c address and @c port.
+    /** @note This function returns immediately, it does not block.
+        @param address Address on which to listen to. Default is to listen on
+        all interfaces which means the server can be accessed from anywhere.
+        @param port Port number on which the server should run.
+        @return True if the server was started successfully, false otherwise.
+        @sa listen(quint16) */
+    bool listen(const QHostAddress &address = QHostAddress::Any, quint16 port = 80);
+
+    /// Starts the server on @c port listening on all interfaces.
+    /** @param port Port number on which the server should run.
+        @return True if the server was started successfully, false otherwise.
+        @sa listen(const QHostAddress&, quint16) */
+    bool listen(quint16 port);
+
+    /// Stop the server and listening for new connections.
+    void close();
+Q_SIGNALS:
+    /// Emitted when a client makes a new request to the server.
+    /** The slot should use the given @c request and @c response
+        objects to communicate with the client.
+        @param request New incoming request.
+        @param response Response object to the request. */
+    void newRequest(QHttpRequest *request, QHttpResponse *response);
+
+private Q_SLOTS:
+    void newConnection();
+
+private:
+    QTcpServer *m_tcpServer;
+};
+
+#endif
diff --git a/external/qhttpserver/src/qhttpserverapi.h b/external/qhttpserver/src/qhttpserverapi.h
new file mode 100755
index 0000000..38e4625
--- /dev/null
+++ b/external/qhttpserver/src/qhttpserverapi.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef Q_HTTP_SERVER_API
+#define Q_HTTP_SERVER_API
+
+#include <QtGlobal>
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#ifdef Q_OS_WIN
+// Define to export or import depending if we are building or using the library.
+// QHTTPSERVER_EXPORT should only be defined when building.
+#if defined(QHTTPSERVER_EXPORT)
+#define QHTTPSERVER_API __declspec(dllexport)
+#else
+#define QHTTPSERVER_API __declspec(dllimport)
+#endif
+#else
+// Define empty for other platforms
+#define QHTTPSERVER_API
+#endif
+#else
+#ifdef Q_WS_WIN
+// Define to export or import depending if we are building or using the library.
+// QHTTPSERVER_EXPORT should only be defined when building.
+#if defined(QHTTPSERVER_EXPORT)
+#define QHTTPSERVER_API __declspec(dllexport)
+#else
+#define QHTTPSERVER_API __declspec(dllimport)
+#endif
+#else
+// Define empty for other platforms
+#define QHTTPSERVER_API
+#endif
+#endif
+
+#endif
diff --git a/external/qhttpserver/src/qhttpserverfwd.h b/external/qhttpserver/src/qhttpserverfwd.h
new file mode 100755
index 0000000..ca7c266
--- /dev/null
+++ b/external/qhttpserver/src/qhttpserverfwd.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2011-2014 Nikhil Marathe <nsm.nikhil@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef Q_HTTP_SERVER_FWD
+#define Q_HTTP_SERVER_FWD
+
+#include <QHash>
+#include <QString>
+
+/*!
+ * A map of request or response headers
+ */
+typedef QHash<QString, QString> HeaderHash;
+
+// QHttpServer
+class QHttpServer;
+class QHttpConnection;
+class QHttpRequest;
+class QHttpResponse;
+
+// Qt
+class QTcpServer;
+class QTcpSocket;
+
+// http_parser
+struct http_parser_settings;
+struct http_parser;
+
+#endif
diff --git a/external/qhttpserver/src/src.pro b/external/qhttpserver/src/src.pro
new file mode 100755
index 0000000..dfe8789
--- /dev/null
+++ b/external/qhttpserver/src/src.pro
@@ -0,0 +1,37 @@
+include(../qhttpserver.pri)
+
+QHTTPSERVER_BASE = ..
+TEMPLATE = lib
+
+TARGET = qhttpserver
+
+!win32:VERSION = 0.1.0
+
+QT += network
+QT -= gui
+
+CONFIG += dll debug_and_release
+
+CONFIG(debug, debug|release) {
+    win32: TARGET = $$join(TARGET,,,d)
+}
+
+DEFINES += QHTTPSERVER_EXPORT
+
+INCLUDEPATH += $$QHTTPSERVER_BASE/http-parser
+
+PRIVATE_HEADERS += $$QHTTPSERVER_BASE/http-parser/http_parser.h qhttpconnection.h
+
+PUBLIC_HEADERS += qhttpserver.h qhttprequest.h qhttpresponse.h qhttpserverapi.h qhttpserverfwd.h
+
+HEADERS = $$PRIVATE_HEADERS $$PUBLIC_HEADERS
+SOURCES = *.cpp $$QHTTPSERVER_BASE/http-parser/http_parser.c
+
+OBJECTS_DIR = $$QHTTPSERVER_BASE/build
+MOC_DIR = $$QHTTPSERVER_BASE/build
+DESTDIR = $$QHTTPSERVER_BASE/lib
+
+target.path = $$LIBDIR
+headers.path = $$INCLUDEDIR
+headers.files = $$PUBLIC_HEADERS
+INSTALLS += target headers
diff --git a/external/qslog/CMakeLists.txt b/external/qslog/CMakeLists.txt
new file mode 100644
index 0000000..87b66b7
--- /dev/null
+++ b/external/qslog/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(CMAKE_AUTOMOC ON)
+aux_source_directory(. QSLOG_SRC)
+add_library(qslog STATIC ${QSLOG_SRC})
diff --git a/external/qslog/LICENSE.txt b/external/qslog/LICENSE.txt
new file mode 100644
index 0000000..af90342
--- /dev/null
+++ b/external/qslog/LICENSE.txt
@@ -0,0 +1,24 @@
+Copyright (c) 2014, Razvan Petru
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+* The name of the contributors may not be used to endorse or promote products
+  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/external/qslog/QsLog.cpp b/external/qslog/QsLog.cpp
new file mode 100644
index 0000000..7004529
--- /dev/null
+++ b/external/qslog/QsLog.cpp
@@ -0,0 +1,258 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "QsLog.h"
+#include "QsLogDest.h"
+#ifdef QS_LOG_SEPARATE_THREAD
+#include <QThreadPool>
+#include <QRunnable>
+#endif
+#include <QMutex>
+#include <QVector>
+#include <QDateTime>
+#include <QtGlobal>
+#include <cassert>
+#include <cstdlib>
+#include <stdexcept>
+
+namespace QsLogging
+{
+typedef QVector<DestinationPtr> DestinationList;
+
+static const char TraceString[] = "TRACE";
+static const char DebugString[] = "DEBUG";
+static const char InfoString[]  = "INFO ";
+static const char WarnString[]  = "WARN ";
+static const char ErrorString[] = "ERROR";
+static const char FatalString[] = "FATAL";
+
+// not using Qt::ISODate because we need the milliseconds too
+static const QString fmtDateTime("yyyy-MM-dd hh:mm:ss");
+
+static Logger* sInstance = 0;
+
+static const char* LevelToText(Level theLevel)
+{
+    switch (theLevel) {
+        case TraceLevel:
+            return TraceString;
+        case DebugLevel:
+            return DebugString;
+        case InfoLevel:
+            return InfoString;
+        case WarnLevel:
+            return WarnString;
+        case ErrorLevel:
+            return ErrorString;
+        case FatalLevel:
+            return FatalString;
+        case OffLevel:
+            return "";
+        default: {
+            assert(!"bad log level");
+            return InfoString;
+        }
+    }
+}
+
+#ifdef QS_LOG_SEPARATE_THREAD
+class LogWriterRunnable : public QRunnable
+{
+public:
+    LogWriterRunnable(QString message, Level level);
+    virtual void run();
+
+private:
+    QString mMessage;
+    Level mLevel;
+};
+#endif
+
+class LoggerImpl
+{
+public:
+    LoggerImpl();
+
+#ifdef QS_LOG_SEPARATE_THREAD
+    QThreadPool threadPool;
+#endif
+    QMutex logMutex;
+    Level level;
+    DestinationList destList;
+    ProcessingCallback process;
+};
+
+#ifdef QS_LOG_SEPARATE_THREAD
+LogWriterRunnable::LogWriterRunnable(QString message, Level level)
+    : QRunnable()
+    , mMessage(message)
+    , mLevel(level)
+{
+}
+
+void LogWriterRunnable::run()
+{
+    Logger::instance().write(mMessage, mLevel);
+}
+#endif
+
+
+LoggerImpl::LoggerImpl()
+    : level(InfoLevel)
+    , process(0)
+{
+    // assume at least file + console
+    destList.reserve(2);
+#ifdef QS_LOG_SEPARATE_THREAD
+    threadPool.setMaxThreadCount(1);
+    threadPool.setExpiryTimeout(-1);
+#endif
+}
+
+
+Logger::Logger()
+    : d(new LoggerImpl)
+{
+}
+
+Logger& Logger::instance()
+{
+    if (!sInstance)
+        sInstance = new Logger;
+
+    return *sInstance;
+}
+
+void Logger::destroyInstance()
+{
+    delete sInstance;
+    sInstance = 0;
+}
+
+// tries to extract the level from a string log message. If available, conversionSucceeded will
+// contain the conversion result.
+Level Logger::levelFromLogMessage(const QString& logMessage, bool* conversionSucceeded)
+{
+    if (conversionSucceeded)
+        *conversionSucceeded = true;
+
+    if (logMessage.startsWith(QLatin1String(TraceString)))
+        return TraceLevel;
+    if (logMessage.startsWith(QLatin1String(DebugString)))
+        return DebugLevel;
+    if (logMessage.startsWith(QLatin1String(InfoString)))
+        return InfoLevel;
+    if (logMessage.startsWith(QLatin1String(WarnString)))
+        return WarnLevel;
+    if (logMessage.startsWith(QLatin1String(ErrorString)))
+        return ErrorLevel;
+    if (logMessage.startsWith(QLatin1String(FatalString)))
+        return FatalLevel;
+
+    if (conversionSucceeded)
+        *conversionSucceeded = false;
+    return OffLevel;
+}
+
+Logger::~Logger()
+{
+#ifdef QS_LOG_SEPARATE_THREAD
+    d->threadPool.waitForDone();
+#endif
+    delete d;
+    d = 0;
+}
+
+void Logger::addDestination(DestinationPtr destination)
+{
+    assert(destination.data());
+    d->destList.push_back(destination);
+}
+
+void Logger::setLoggingLevel(Level newLevel)
+{
+    d->level = newLevel;
+}
+
+Level Logger::loggingLevel() const
+{
+    return d->level;
+}
+
+void Logger::setProcessingCallback(ProcessingCallback cb)
+{
+    d->process = cb;
+}
+
+//! creates the complete log message and passes it to the logger
+void Logger::Helper::writeToLog()
+{
+    const char* const levelName = LevelToText(level);
+    const QString completeMessage(QString("%1 [ %2 ] %3")
+                                  .arg(QDateTime::currentDateTime().toString(fmtDateTime))
+                                  .arg(levelName)
+                                  .arg(buffer)
+                                  );
+
+    Logger::instance().enqueueWrite(completeMessage, level);
+}
+
+Logger::Helper::~Helper()
+{
+    try {
+        writeToLog();
+    }
+    catch(std::exception&) {
+        // you shouldn't throw exceptions from a sink
+        assert(!"exception in logger helper destructor");
+        throw;
+    }
+}
+
+//! directs the message to the task queue or writes it directly
+void Logger::enqueueWrite(QString message, Level level)
+{
+    if (d->process)
+        d->process(message);
+#ifdef QS_LOG_SEPARATE_THREAD
+    LogWriterRunnable *r = new LogWriterRunnable(message, level);
+    d->threadPool.start(r);
+#else
+    write(message, level);
+#endif
+}
+
+//! Sends the message to all the destinations. The level for this message is passed in case
+//! it's useful for processing in the destination.
+void Logger::write(const QString& message, Level level)
+{
+    QMutexLocker lock(&d->logMutex);
+    for (DestinationList::iterator it = d->destList.begin(),
+        endIt = d->destList.end();it != endIt;++it) {
+        (*it)->write(message, level);
+    }
+}
+
+} // end namespace
diff --git a/external/qslog/QsLog.h b/external/qslog/QsLog.h
new file mode 100644
index 0000000..2cda2ae
--- /dev/null
+++ b/external/qslog/QsLog.h
@@ -0,0 +1,142 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QSLOG_H
+#define QSLOG_H
+
+#include "QsLogLevel.h"
+#include "QsLogDest.h"
+#include <QDebug>
+#include <QString>
+#include <QFileInfo>
+
+#define QS_LOG_VERSION "2.0b3"
+
+namespace QsLogging
+{
+class Destination;
+class LoggerImpl; // d pointer
+
+typedef void (*ProcessingCallback)(QString& message);
+
+class QSLOG_SHARED_OBJECT Logger
+{
+public:
+    static Logger& instance();
+    static void destroyInstance();
+    static Level levelFromLogMessage(const QString& logMessage, bool* conversionSucceeded = 0);
+
+    ~Logger();
+
+    //! Adds a log message destination. Don't add null destinations.
+    void addDestination(DestinationPtr destination);
+    //! Logging at a level < 'newLevel' will be ignored
+    void setLoggingLevel(Level newLevel);
+    //! The default level is INFO
+    Level loggingLevel() const;
+    //! Set callback for changing message contents before writing to output
+    void setProcessingCallback(ProcessingCallback cb);
+
+    //! The helper forwards the streaming to QDebug and builds the final
+    //! log message.
+    class QSLOG_SHARED_OBJECT Helper
+    {
+    public:
+        explicit Helper(Level logLevel) :
+            level(logLevel),
+            qtDebug(&buffer) {}
+        ~Helper();
+        QDebug& stream(){ return qtDebug; }
+
+    private:
+        void writeToLog();
+
+        Level level;
+        QString buffer;
+        QDebug qtDebug;
+    };
+
+private:
+    Logger();
+    Logger(const Logger&);            // not available
+    Logger& operator=(const Logger&); // not available
+
+    void enqueueWrite(QString message, Level level);
+    void write(const QString& message, Level level);
+
+    LoggerImpl* d;
+
+    friend class LogWriterRunnable;
+};
+
+} // end namespace
+
+//! Logging macros: define QS_LOG_LINE_NUMBERS to get the file and line number
+//! in the log output.
+#ifndef QS_LOG_LINE_NUMBERS
+#define QLOG_TRACE() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::TraceLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::TraceLevel).stream()
+#define QLOG_DEBUG() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::DebugLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream()
+#define QLOG_INFO()  \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::InfoLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream()
+#define QLOG_WARN()  \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::WarnLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream()
+#define QLOG_ERROR() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::ErrorLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream()
+#define QLOG_FATAL() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::FatalLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream()
+#else
+#define QLOG_TRACE() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::TraceLevel) {} \
+    else  QsLogging::Logger::Helper(QsLogging::TraceLevel).stream() << qPrintable(QFileInfo(__FILE__).fileName()) << '@' << __LINE__ << "-"
+#define QLOG_DEBUG() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::DebugLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::DebugLevel).stream() << qPrintable(QFileInfo(__FILE__).fileName()) << '@' << __LINE__ << "-"
+#define QLOG_INFO()  \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::InfoLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::InfoLevel).stream() << qPrintable(QFileInfo(__FILE__).fileName()) << '@' << __LINE__ << "-"
+#define QLOG_WARN()  \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::WarnLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::WarnLevel).stream() << qPrintable(QFileInfo(__FILE__).fileName()) << '@' << __LINE__ << "-"
+#define QLOG_ERROR() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::ErrorLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::ErrorLevel).stream() << qPrintable(QFileInfo(__FILE__).fileName()) << '@' << __LINE__ << "-"
+#define QLOG_FATAL() \
+    if (QsLogging::Logger::instance().loggingLevel() > QsLogging::FatalLevel) {} \
+    else QsLogging::Logger::Helper(QsLogging::FatalLevel).stream() << qPrintable(QFileInfo(__FILE__).fileName()) << '@' << __LINE__ << "-"
+#endif
+
+#ifdef QS_LOG_DISABLE
+#include "QsLogDisableForThisFile.h"
+#endif
+
+#endif // QSLOG_H
diff --git a/external/qslog/QsLogDest.cpp b/external/qslog/QsLogDest.cpp
new file mode 100644
index 0000000..cddd7d0
--- /dev/null
+++ b/external/qslog/QsLogDest.cpp
@@ -0,0 +1,73 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "QsLogDest.h"
+#include "QsLogDestConsole.h"
+#include "QsLogDestFile.h"
+#include "QsLogDestFunctor.h"
+#include <QString>
+
+namespace QsLogging
+{
+
+Destination::~Destination()
+{
+}
+
+//! destination factory
+DestinationPtr DestinationFactory::MakeFileDestination(const QString& filePath,
+    LogRotationOption rotation, const MaxSizeBytes &sizeInBytesToRotateAfter,
+    const MaxOldLogCount &oldLogsToKeep)
+{
+    if (EnableLogRotation == rotation || EnableLogRotationOnOpen == rotation) {
+        QScopedPointer<SizeRotationStrategy> logRotation(new SizeRotationStrategy);
+        logRotation->setMaximumSizeInBytes(sizeInBytesToRotateAfter.size);
+        logRotation->setBackupCount(oldLogsToKeep.count);
+
+        FileDestination *dest = new FileDestination(filePath, RotationStrategyPtr(logRotation.take()));
+        if (EnableLogRotationOnOpen == rotation && dest->rotationStrategy()->currentSizeInBytes() > 0)
+          dest->rotate();
+        return DestinationPtr(dest);
+    }
+
+    return DestinationPtr(new FileDestination(filePath, RotationStrategyPtr(new NullRotationStrategy)));
+}
+
+DestinationPtr DestinationFactory::MakeDebugOutputDestination()
+{
+    return DestinationPtr(new DebugOutputDestination);
+}
+
+DestinationPtr DestinationFactory::MakeFunctorDestination(QsLogging::Destination::LogFunction f)
+{
+    return DestinationPtr(new FunctorDestination(f));
+}
+
+DestinationPtr DestinationFactory::MakeFunctorDestination(QObject *receiver, const char *member)
+{
+    return DestinationPtr(new FunctorDestination(receiver, member));
+}
+
+} // end namespace
diff --git a/external/qslog/QsLogDest.h b/external/qslog/QsLogDest.h
new file mode 100644
index 0000000..31c9c56
--- /dev/null
+++ b/external/qslog/QsLogDest.h
@@ -0,0 +1,101 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QSLOGDEST_H
+#define QSLOGDEST_H
+
+#include "QsLogLevel.h"
+#include <QSharedPointer>
+#include <QtGlobal>
+class QString;
+class QObject;
+
+#ifdef QSLOG_IS_SHARED_LIBRARY
+#define QSLOG_SHARED_OBJECT Q_DECL_EXPORT
+#elif QSLOG_IS_SHARED_LIBRARY_IMPORT
+#define QSLOG_SHARED_OBJECT Q_DECL_IMPORT
+#else
+#define QSLOG_SHARED_OBJECT
+#endif
+
+namespace QsLogging
+{
+
+class QSLOG_SHARED_OBJECT Destination
+{
+public:
+    typedef void (*LogFunction)(const QString &message, Level level);
+    virtual void rotate() = 0;
+
+public:
+    virtual ~Destination();
+    virtual void write(const QString& message, Level level) = 0;
+    virtual bool isValid() = 0; // returns whether the destination was created correctly
+};
+typedef QSharedPointer<Destination> DestinationPtr;
+
+
+// a series of "named" paramaters, to make the file destination creation more readable
+enum LogRotationOption
+{
+    DisableLogRotation = 0,
+    EnableLogRotation  = 1,
+    EnableLogRotationOnOpen = 2,
+};
+
+struct QSLOG_SHARED_OBJECT MaxSizeBytes
+{
+    MaxSizeBytes() : size(0) {}
+    explicit MaxSizeBytes(qint64 size_) : size(size_) {}
+    qint64 size;
+};
+
+struct QSLOG_SHARED_OBJECT MaxOldLogCount
+{
+    MaxOldLogCount() : count(0) {}
+    explicit MaxOldLogCount(int count_) : count(count_) {}
+    int count;
+};
+
+
+//! Creates logging destinations/sinks. The caller shares ownership of the destinations with the logger.
+//! After being added to a logger, the caller can discard the pointers.
+class QSLOG_SHARED_OBJECT DestinationFactory
+{
+public:
+    static DestinationPtr MakeFileDestination(const QString& filePath,
+        LogRotationOption rotation = DisableLogRotation,
+        const MaxSizeBytes &sizeInBytesToRotateAfter = MaxSizeBytes(),
+        const MaxOldLogCount &oldLogsToKeep = MaxOldLogCount());
+    static DestinationPtr MakeDebugOutputDestination();
+    // takes a pointer to a function
+    static DestinationPtr MakeFunctorDestination(Destination::LogFunction f);
+    // takes a QObject + signal/slot
+    static DestinationPtr MakeFunctorDestination(QObject *receiver, const char *member);
+};
+
+} // end namespace
+
+#endif // QSLOGDEST_H
diff --git a/external/qslog/QsLogDestConsole.cpp b/external/qslog/QsLogDestConsole.cpp
new file mode 100644
index 0000000..9efe0e3
--- /dev/null
+++ b/external/qslog/QsLogDestConsole.cpp
@@ -0,0 +1,52 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "QsLogDestConsole.h"
+#include <QString>
+#include <QtGlobal>
+
+#if defined(Q_OS_WIN)
+#define WIN32_LEAN_AND_MEAN
+void QsDebugOutput::output( const QString& message )
+{
+}
+#elif defined(Q_OS_UNIX)
+#include <cstdio>
+void QsDebugOutput::output( const QString& message )
+{
+   fprintf(stderr, "%s\n", qPrintable(message));
+   fflush(stderr);
+}
+#endif
+
+void QsLogging::DebugOutputDestination::write(const QString& message, Level)
+{
+    QsDebugOutput::output(message);
+}
+
+bool QsLogging::DebugOutputDestination::isValid()
+{
+    return true;
+}
diff --git a/external/qslog/QsLogDestConsole.h b/external/qslog/QsLogDestConsole.h
new file mode 100644
index 0000000..04bd868
--- /dev/null
+++ b/external/qslog/QsLogDestConsole.h
@@ -0,0 +1,53 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QSLOGDESTCONSOLE_H
+#define QSLOGDESTCONSOLE_H
+
+#include "QsLogDest.h"
+
+class QString;
+
+class QsDebugOutput
+{
+public:
+   static void output(const QString& a_message);
+};
+
+namespace QsLogging
+{
+
+// debugger sink
+class DebugOutputDestination : public Destination
+{
+public:
+    virtual void write(const QString& message, Level level);
+    virtual bool isValid();
+    virtual void rotate() { }
+};
+
+}
+
+#endif // QSLOGDESTCONSOLE_H
diff --git a/external/qslog/QsLogDestFile.cpp b/external/qslog/QsLogDestFile.cpp
new file mode 100644
index 0000000..307b0af
--- /dev/null
+++ b/external/qslog/QsLogDestFile.cpp
@@ -0,0 +1,163 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "QsLogDestFile.h"
+#include <QTextCodec>
+#include <QDateTime>
+#include <QtGlobal>
+#include <iostream>
+
+const int QsLogging::SizeRotationStrategy::MaxBackupCount = 10;
+
+QsLogging::RotationStrategy::~RotationStrategy()
+{
+}
+
+QsLogging::SizeRotationStrategy::SizeRotationStrategy() : mCurrentSizeInBytes(0), mMaxSizeInBytes(0), mBackupsCount(0)
+{
+}
+
+void QsLogging::SizeRotationStrategy::setInitialInfo(const QFile& file)
+{
+  mFileName = file.fileName();
+  mCurrentSizeInBytes = file.size();
+}
+
+void QsLogging::SizeRotationStrategy::includeMessageInCalculation(const QString& message)
+{
+  mCurrentSizeInBytes += message.toUtf8().size();
+}
+
+bool QsLogging::SizeRotationStrategy::shouldRotate()
+{
+  return mCurrentSizeInBytes > mMaxSizeInBytes;
+}
+
+// Algorithm assumes backups will be named filename.X, where 1 <= X <= mBackupsCount.
+// All X's will be shifted up.
+void QsLogging::SizeRotationStrategy::rotate()
+{
+  if (!mBackupsCount)
+  {
+    if (!QFile::remove(mFileName))
+      std::cerr << "QsLog: backup delete failed " << qPrintable(mFileName);
+    return;
+  }
+
+  // 1. find the last existing backup than can be shifted up
+  const QString logNamePattern = mFileName + QString::fromUtf8(".%1");
+  int lastExistingBackupIndex = 0;
+  for (int i = 1; i <= mBackupsCount; ++i)
+  {
+    const QString backupFileName = logNamePattern.arg(i);
+    if (QFile::exists(backupFileName))
+      lastExistingBackupIndex = qMin(i, mBackupsCount - 1);
+    else
+      break;
+  }
+
+  // 2. shift up
+  for (int i = lastExistingBackupIndex; i >= 1; --i)
+  {
+    const QString oldName = logNamePattern.arg(i);
+    const QString newName = logNamePattern.arg(i + 1);
+    QFile::remove(newName);
+    const bool renamed = QFile::rename(oldName, newName);
+    if (!renamed)
+    {
+      std::cerr << "QsLog: could not rename backup " << qPrintable(oldName) << " to " << qPrintable(newName);
+    }
+  }
+
+  // 3. rename current log file
+  const QString newName = logNamePattern.arg(1);
+  if (QFile::exists(newName))
+    QFile::remove(newName);
+  if (!QFile::rename(mFileName, newName))
+  {
+    std::cerr << "QsLog: could not rename log " << qPrintable(mFileName) << " to " << qPrintable(newName);
+  }
+}
+
+QIODevice::OpenMode QsLogging::SizeRotationStrategy::recommendedOpenModeFlag()
+{
+  return QIODevice::Append;
+}
+
+void QsLogging::SizeRotationStrategy::setMaximumSizeInBytes(qint64 size)
+{
+  Q_ASSERT(size >= 0);
+  mMaxSizeInBytes = size;
+}
+
+void QsLogging::SizeRotationStrategy::setBackupCount(int backups)
+{
+  Q_ASSERT(backups >= 0);
+  mBackupsCount = qMin(backups, SizeRotationStrategy::MaxBackupCount);
+}
+
+qint64 QsLogging::SizeRotationStrategy::currentSizeInBytes()
+{
+  return mCurrentSizeInBytes;
+}
+
+QsLogging::FileDestination::FileDestination(const QString& filePath, RotationStrategyPtr rotationStrategy)
+  : mRotationStrategy(rotationStrategy)
+{
+  mFile.setFileName(filePath);
+  if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag()))
+    std::cerr << "QsLog: could not open log file " << qPrintable(filePath);
+  mOutputStream.setDevice(&mFile);
+  mOutputStream.setCodec("UTF-8");
+
+  mRotationStrategy->setInitialInfo(mFile);
+}
+
+void QsLogging::FileDestination::write(const QString& message, Level)
+{
+  mRotationStrategy->includeMessageInCalculation(message);
+  if (mRotationStrategy->shouldRotate())
+    rotate();
+
+  mOutputStream << message << endl;
+  mOutputStream.flush();
+}
+
+bool QsLogging::FileDestination::isValid()
+{
+  return mFile.isOpen();
+}
+
+void QsLogging::FileDestination::rotate()
+{
+  mOutputStream.setDevice(NULL);
+  mFile.close();
+  mRotationStrategy->rotate();
+  if (!mFile.open(QFile::WriteOnly | QFile::Text | mRotationStrategy->recommendedOpenModeFlag()))
+    std::cerr << "QsLog: could not reopen log file " << qPrintable(mFile.fileName());
+  mRotationStrategy->setInitialInfo(mFile);
+  mOutputStream.setDevice(&mFile);
+  mOutputStream.setCodec("UTF-8");
+}
diff --git a/external/qslog/QsLogDestFile.h b/external/qslog/QsLogDestFile.h
new file mode 100644
index 0000000..6b5a688
--- /dev/null
+++ b/external/qslog/QsLogDestFile.h
@@ -0,0 +1,106 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QSLOGDESTFILE_H
+#define QSLOGDESTFILE_H
+
+#include "QsLogDest.h"
+#include <QFile>
+#include <QTextStream>
+#include <QtGlobal>
+#include <QSharedPointer>
+
+namespace QsLogging
+{
+class RotationStrategy
+{
+public:
+    virtual ~RotationStrategy();
+
+    virtual void setInitialInfo(const QFile &file) = 0;
+    virtual void includeMessageInCalculation(const QString &message) = 0;
+    virtual bool shouldRotate() = 0;
+    virtual void rotate() = 0;
+    virtual QIODevice::OpenMode recommendedOpenModeFlag() = 0;
+    virtual qint64 currentSizeInBytes() {return 0;}
+};
+
+// Never rotates file, overwrites existing file.
+class NullRotationStrategy : public RotationStrategy
+{
+public:
+    virtual void setInitialInfo(const QFile &) {}
+    virtual void includeMessageInCalculation(const QString &) {}
+    virtual bool shouldRotate() { return false; }
+    virtual void rotate() {}
+    virtual QIODevice::OpenMode recommendedOpenModeFlag() { return QIODevice::Truncate; }
+};
+
+// Rotates after a size is reached, keeps a number of <= 10 backups, appends to existing file.
+class SizeRotationStrategy : public RotationStrategy
+{
+public:
+    SizeRotationStrategy();
+    static const int MaxBackupCount;
+
+    virtual void setInitialInfo(const QFile &file);
+    virtual void includeMessageInCalculation(const QString &message);
+    virtual bool shouldRotate();
+    virtual void rotate();
+    virtual QIODevice::OpenMode recommendedOpenModeFlag();
+    virtual qint64 currentSizeInBytes();
+
+    void setMaximumSizeInBytes(qint64 size);
+    void setBackupCount(int backups);
+
+private:
+    QString mFileName;
+    qint64 mCurrentSizeInBytes;
+    qint64 mMaxSizeInBytes;
+    int mBackupsCount;
+};
+
+typedef QSharedPointer<RotationStrategy> RotationStrategyPtr;
+
+// file message sink
+class FileDestination : public Destination
+{
+public:
+    FileDestination(const QString& filePath, RotationStrategyPtr rotationStrategy);
+    virtual void write(const QString& message, Level level);
+    virtual bool isValid();
+    virtual void rotate();
+
+    QSharedPointer<RotationStrategy> rotationStrategy() { return mRotationStrategy; }
+
+private:
+    QFile mFile;
+    QTextStream mOutputStream;
+    QSharedPointer<RotationStrategy> mRotationStrategy;
+};
+
+}
+
+#endif // QSLOGDESTFILE_H
diff --git a/external/qslog/QsLogDestFunctor.cpp b/external/qslog/QsLogDestFunctor.cpp
new file mode 100644
index 0000000..601139d
--- /dev/null
+++ b/external/qslog/QsLogDestFunctor.cpp
@@ -0,0 +1,57 @@
+// Copyright (c) 2014, Razvan Petru
+// Copyright (c) 2014, Omar Carey
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "QsLogDestFunctor.h"
+#include <cstddef>
+#include <QtGlobal>
+
+QsLogging::FunctorDestination::FunctorDestination(LogFunction f)
+    : QObject(NULL)
+    , mLogFunction(f)
+{
+}
+
+QsLogging::FunctorDestination::FunctorDestination(QObject *receiver, const char *member)
+    : QObject(NULL)
+    , mLogFunction(NULL)
+{
+    connect(this, SIGNAL(logMessageReady(QString,int)), receiver, member, Qt::QueuedConnection);
+}
+
+
+void QsLogging::FunctorDestination::write(const QString &message, QsLogging::Level level)
+{
+    if (mLogFunction)
+        mLogFunction(message, level);
+
+    if (level > QsLogging::TraceLevel)
+        emit logMessageReady(message, static_cast<int>(level));
+}
+
+bool QsLogging::FunctorDestination::isValid()
+{
+    return true;
+}
diff --git a/external/qslog/QsLogDestFunctor.h b/external/qslog/QsLogDestFunctor.h
new file mode 100644
index 0000000..9e6ee1e
--- /dev/null
+++ b/external/qslog/QsLogDestFunctor.h
@@ -0,0 +1,60 @@
+// Copyright (c) 2014, Razvan Petru
+// Copyright (c) 2014, Omar Carey
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QSLOGDESTFUNCTOR_H
+#define QSLOGDESTFUNCTOR_H
+
+#include "QsLogDest.h"
+#include <QObject>
+
+namespace QsLogging
+{
+// Offers various types of function-like sinks.
+// This is an advanced destination type. Depending on your configuration, LogFunction might be
+// called from a different thread or even a different binary. You should not access QsLog from
+// inside LogFunction and should not perform any time-consuming operations.
+// logMessageReady is connected through a queued connection and trace messages are not included
+class FunctorDestination : public QObject, public Destination
+{
+    Q_OBJECT
+public:
+    explicit FunctorDestination(LogFunction f);
+    FunctorDestination(QObject *receiver, const char *member);
+
+    virtual void write(const QString &message, Level level);
+    virtual bool isValid();
+    virtual void rotate() { }
+
+protected:
+    // int used to avoid registering a new enum type
+    Q_SIGNAL void logMessageReady(const QString &message, int level);
+
+private:
+    LogFunction mLogFunction;
+};
+}
+
+#endif // QSLOGDESTFUNCTOR_H
diff --git a/external/qslog/QsLogDisableForThisFile.h b/external/qslog/QsLogDisableForThisFile.h
new file mode 100644
index 0000000..c70af10
--- /dev/null
+++ b/external/qslog/QsLogDisableForThisFile.h
@@ -0,0 +1,22 @@
+#ifndef QSLOGDISABLEFORTHISFILE_H
+#define QSLOGDISABLEFORTHISFILE_H
+
+#include <QtDebug>
+// When included AFTER QsLog.h, this file will disable logging in that C++ file. When included
+// before, it will lead to compiler warnings or errors about macro redefinitions.
+
+#undef QLOG_TRACE
+#undef QLOG_DEBUG
+#undef QLOG_INFO
+#undef QLOG_WARN
+#undef QLOG_ERROR
+#undef QLOG_FATAL
+
+#define QLOG_TRACE() if (1) {} else qDebug()
+#define QLOG_DEBUG() if (1) {} else qDebug()
+#define QLOG_INFO()  if (1) {} else qDebug()
+#define QLOG_WARN()  if (1) {} else qDebug()
+#define QLOG_ERROR() if (1) {} else qDebug()
+#define QLOG_FATAL() if (1) {} else qDebug()
+
+#endif // QSLOGDISABLEFORTHISFILE_H
diff --git a/external/qslog/QsLogLevel.h b/external/qslog/QsLogLevel.h
new file mode 100644
index 0000000..6298473
--- /dev/null
+++ b/external/qslog/QsLogLevel.h
@@ -0,0 +1,45 @@
+// Copyright (c) 2013, Razvan Petru
+// All rights reserved.
+
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+
+// * Redistributions of source code must retain the above copyright notice, this
+//   list of conditions and the following disclaimer.
+// * Redistributions in binary form must reproduce the above copyright notice, this
+//   list of conditions and the following disclaimer in the documentation and/or other
+//   materials provided with the distribution.
+// * The name of the contributors may not be used to endorse or promote products
+//   derived from this software without specific prior written permission.
+
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+// IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+// OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#ifndef QSLOGLEVEL_H
+#define QSLOGLEVEL_H
+
+namespace QsLogging
+{
+
+enum Level
+{
+    TraceLevel = 0,
+    DebugLevel,
+    InfoLevel,
+    WarnLevel,
+    ErrorLevel,
+    FatalLevel,
+    OffLevel
+};
+
+}
+
+#endif // QSLOGLEVEL_H
diff --git a/external/qslog/QsLogReadme.txt b/external/qslog/QsLogReadme.txt
new file mode 100644
index 0000000..a7a50e0
--- /dev/null
+++ b/external/qslog/QsLogReadme.txt
@@ -0,0 +1,65 @@
+QsLog - the simple Qt logger
+-------------------------------------------------------------------------------
+QsLog is an easy to use logger that is based on Qt's QDebug class.
+
+Features
+-------------------------------------------------------------------------------
+    * Six logging levels (from trace to fatal)
+    * Logging level threshold configurable at runtime.
+    * Minimum overhead when logging is turned off.
+    * Multiple destinations, comes with file and debug destinations.
+    * Thread-safe
+    * Logging of common Qt types out of the box.
+    * Immediate logging or queueing messages in a separate thread.
+    * Small dependency: just drop it in your project directly.
+
+Usage
+-------------------------------------------------------------------------------
+By directly including QsLog in your project:
+    1. Include QsLog.pri in your pro file
+    2. Include QsLog.h in your C++ files. Include QsLogDest.h only where you create/add destinations.
+    3. Get the instance of the logger by calling QsLogging::Logger::instance();
+    4. Optionally set the logging level. Info is default.
+    5. Create as many destinations as you want by using the QsLogging::DestinationFactory.
+    6. Add the destinations to the logger instance by calling addDestination.
+    7. Start logging!
+    Note: when you want to use QsLog both from an executable and a shared library you have to
+          link dynamically with QsLog due to a limitation with static variables.
+
+By linking to QsLog dynamically:
+    1. Build QsLog using the QsLogSharedLibrary.pro.
+    2. Add the QsLog shared library to your LIBS project dependencies.
+    3. Follow the steps in "directly including QsLog in your project" starting with step 2.
+
+Configuration
+-------------------------------------------------------------------------------
+QsLog has several configurable parameters:
+    * defining QS_LOG_LINE_NUMBERS in the .pri file enables writing the file and line number
+      automatically for each logging call
+    * defining QS_LOG_SEPARATE_THREAD will route all log messages to a separate thread.
+
+Sometimes it's necessary to turn off logging. This can be done in several ways:
+    * globally, at compile time, by enabling the QS_LOG_DISABLE macro in the .pri file.
+    * globally, at run time, by setting the log level to "OffLevel".
+    * per file, at compile time, by including QsLogDisableForThisFile.h in the target file.
+
+Thread safety
+-------------------------------------------------------------------------------
+The Qt docs say: A thread-safe function can be called simultaneously from multiple threads,
+even when the invocations use shared data, because all references to the shared data are serialized.
+A reentrant function can also be called simultaneously from multiple threads, but only if each
+invocation uses its own data.
+
+Since sending the log message to the destinations is protected by a mutex, the logging macros are
+thread-safe provided that the log has been initialized - i.e: instance() has been called.
+The instance function and the setup functions (e.g: setLoggingLevel, addDestination) are NOT
+thread-safe and are NOT reentrant.
+
+IMPORTANT: when using a separate thread for logging, your program might crash at exit time on some
+           operating systems if you won't call Logger::destroyInstance() before your program exits.
+           This function can be called either before returning from main in a console app or
+           inside QCoreApplication::aboutToQuit in a Qt GUI app.
+           The reason is that the logging thread is still running as some objects are destroyed by
+           the OS. Calling destroyInstance will wait for the thread to finish.
+           Nothing will happen if you forget to call the function when not using a separate thread
+           for logging.
diff --git a/qt-patches/0001-qtwebengine-Add-a-backgroundColor-property.patch b/qt-patches/0001-qtwebengine-Add-a-backgroundColor-property.patch
new file mode 100644
index 0000000..7503114
--- /dev/null
+++ b/qt-patches/0001-qtwebengine-Add-a-backgroundColor-property.patch
@@ -0,0 +1,532 @@
+From 3adadda878f63fcca6892c49c4ddc82143d59b66 Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <jturcotte@woboq.com>
+Date: Thu, 9 Jul 2015 21:52:43 +0200
+Subject: [PATCH] Add a backgroundColor property
+
+This also allows setting a transparent color to see through
+the web view's body if its background color isn't specified.
+
+The color is initially held by the top API view and is pulled
+by the WebContentsAdapter in order to set it on the RenderView.
+Since both blink and our local compositors (in the QOpenGLWidget
+case) need to know about this color, RWHVQt takes care of pushing
+it to both. The former through an IPC message and the latter
+directly on the RWHVQtDelegate.
+
+Task-number: QTBUG-41960
+Change-Id: Ie13317b2d087f5612ad9c5fb0e05ca3e91aec9af
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
+---
+ qtwebengine/src/core/common/qt_messages.h                      |  3 ++
+ qtwebengine/src/core/render_widget_host_view_qt.cpp            |  9 ++++++
+ qtwebengine/src/core/render_widget_host_view_qt.h              |  1 +
+ qtwebengine/src/core/render_widget_host_view_qt_delegate.h     |  1 +
+ qtwebengine/src/core/renderer/qt_render_view_observer.cpp      |  6 ++++
+ qtwebengine/src/core/renderer/qt_render_view_observer.h        |  1 +
+ qtwebengine/src/core/type_conversion.h                         |  5 ++++
+ qtwebengine/src/core/web_contents_adapter.cpp                  |  7 +++++
+ qtwebengine/src/core/web_contents_adapter.h                    |  1 +
+ qtwebengine/src/core/web_contents_adapter_client.h             |  1 +
+ qtwebengine/src/core/web_contents_view_qt.cpp                  |  7 +++++
+ qtwebengine/src/core/web_contents_view_qt.h                    |  2 +-
+ qtwebengine/src/webengine/api/qquickwebengineview.cpp          | 34 ++++++++++++++++++++++
+ qtwebengine/src/webengine/api/qquickwebengineview_p.h          |  5 +++-
+ qtwebengine/src/webengine/api/qquickwebengineview_p_p.h        |  2 ++
+ .../render_widget_host_view_qt_delegate_quick.h    |  2 ++
+ ...nder_widget_host_view_qt_delegate_quickwindow.h |  1 +
+ qtwebengine/src/webenginewidgets/api/qwebenginepage.cpp        | 33 +++++++++++++++++++++
+ qtwebengine/src/webenginewidgets/api/qwebenginepage.h          |  3 ++
+ qtwebengine/src/webenginewidgets/api/qwebenginepage_p.h        |  2 ++
+ .../render_widget_host_view_qt_delegate_widget.cpp | 16 +++++++++-
+ .../render_widget_host_view_qt_delegate_widget.h   |  2 ++
+ 22 files changed, 141 insertions(+), 3 deletions(-)
+
+diff --git a/qtwebengine/src/core/common/qt_messages.h b/src/core/common/qt_messages.h
+index c692ee5..25a995b 100644
+--- a/qtwebengine/src/core/common/qt_messages.h
++++ b/qtwebengine/src/core/common/qt_messages.h
+@@ -31,6 +31,9 @@ IPC_MESSAGE_ROUTED1(QtRenderViewObserver_FetchDocumentMarkup,
+ IPC_MESSAGE_ROUTED1(QtRenderViewObserver_FetchDocumentInnerText,
+                     uint64 /* requestId */)
+ 
++IPC_MESSAGE_ROUTED1(QtRenderViewObserver_SetBackgroundColor,
++                    uint32 /* color */)
++
+ IPC_MESSAGE_ROUTED1(WebChannelIPCTransport_Message, std::vector<char> /*binaryJSON*/)
+ 
+ // User scripts messages
+diff --git a/qtwebengine/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
+index 572bc34..20b41bc 100644
+--- a/qtwebengine/src/core/render_widget_host_view_qt.cpp
++++ b/qtwebengine/src/core/render_widget_host_view_qt.cpp
+@@ -36,6 +36,7 @@
+ 
+ #include "render_widget_host_view_qt.h"
+ 
++#include "common/qt_messages.h"
+ #include "browser_accessibility_manager_qt.h"
+ #include "browser_accessibility_qt.h"
+ #include "chromium_overrides.h"
+@@ -408,6 +409,14 @@ gfx::Rect RenderWidgetHostViewQt::GetViewBounds() const
+     return gfx::BoundingRect(p1, p2);
+ }
+ 
++void RenderWidgetHostViewQt::SetBackgroundColor(SkColor color) {
++    RenderWidgetHostViewBase::SetBackgroundColor(color);
++    // Set the background of the compositor if necessary
++    m_delegate->setClearColor(toQt(color));
++    // Set the background of the blink::FrameView
++    m_host->Send(new QtRenderViewObserver_SetBackgroundColor(m_host->GetRoutingID(), color));
++}
++
+ // Return value indicates whether the mouse is locked successfully or not.
+ bool RenderWidgetHostViewQt::LockMouse()
+ {
+diff --git a/qtwebengine/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
+index 248c52f..2724292 100644
+--- a/qtwebengine/src/core/render_widget_host_view_qt.h
++++ b/qtwebengine/src/core/render_widget_host_view_qt.h
+@@ -125,6 +125,7 @@ public:
+     virtual void Hide() Q_DECL_OVERRIDE;
+     virtual bool IsShowing() Q_DECL_OVERRIDE;
+     virtual gfx::Rect GetViewBounds() const Q_DECL_OVERRIDE;
++    virtual void SetBackgroundColor(SkColor color) Q_DECL_OVERRIDE;
+     virtual bool LockMouse() Q_DECL_OVERRIDE;
+     virtual void UnlockMouse() Q_DECL_OVERRIDE;
+     virtual void WasShown() Q_DECL_OVERRIDE;
+diff --git a/qtwebengine/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h
+index da595b9..f4aa9b2 100644
+--- a/qtwebengine/src/core/render_widget_host_view_qt_delegate.h
++++ b/qtwebengine/src/core/render_widget_host_view_qt_delegate.h
+@@ -96,6 +96,7 @@ public:
+     virtual void move(const QPoint &) = 0;
+     virtual void inputMethodStateChanged(bool editorVisible) = 0;
+     virtual void setTooltip(const QString &) = 0;
++    virtual void setClearColor(const QColor &color) = 0;
+ };
+ 
+ } // namespace QtWebEngineCore
+diff --git a/qtwebengine/src/core/renderer/qt_render_view_observer.cpp b/src/core/renderer/qt_render_view_observer.cpp
+index 83534da..ba91e54 100644
+--- a/qtwebengine/src/core/renderer/qt_render_view_observer.cpp
++++ b/qtwebengine/src/core/renderer/qt_render_view_observer.cpp
+@@ -65,6 +65,11 @@ void QtRenderViewObserver::onFetchDocumentInnerText(quint64 requestId)
+         render_view()->GetWebView()->mainFrame()->contentAsText(std::numeric_limits<std::size_t>::max())));
+ }
+ 
++void QtRenderViewObserver::onSetBackgroundColor(quint32 color)
++{
++    render_view()->GetWebView()->setBaseBackgroundColor(color);
++}
++
+ void QtRenderViewObserver::OnFirstVisuallyNonEmptyLayout()
+ {
+     Send(new QtRenderViewObserverHost_DidFirstVisuallyNonEmptyLayout(routing_id()));
+@@ -76,6 +81,7 @@ bool QtRenderViewObserver::OnMessageReceived(const IPC::Message& message)
+     IPC_BEGIN_MESSAGE_MAP(QtRenderViewObserver, message)
+         IPC_MESSAGE_HANDLER(QtRenderViewObserver_FetchDocumentMarkup, onFetchDocumentMarkup)
+         IPC_MESSAGE_HANDLER(QtRenderViewObserver_FetchDocumentInnerText, onFetchDocumentInnerText)
++        IPC_MESSAGE_HANDLER(QtRenderViewObserver_SetBackgroundColor, onSetBackgroundColor)
+         IPC_MESSAGE_UNHANDLED(handled = false)
+     IPC_END_MESSAGE_MAP()
+     return handled;
+diff --git a/qtwebengine/src/core/renderer/qt_render_view_observer.h b/src/core/renderer/qt_render_view_observer.h
+index cb77cd0..3f7829a 100644
+--- a/qtwebengine/src/core/renderer/qt_render_view_observer.h
++++ b/qtwebengine/src/core/renderer/qt_render_view_observer.h
+@@ -47,6 +47,7 @@ public:
+ private:
+     void onFetchDocumentMarkup(quint64 requestId);
+     void onFetchDocumentInnerText(quint64 requestId);
++    void onSetBackgroundColor(quint32 color);
+ 
+     void OnFirstVisuallyNonEmptyLayout() Q_DECL_OVERRIDE;
+ 
+diff --git a/qtwebengine/src/core/type_conversion.h b/src/core/type_conversion.h
+index 66fcd4d..f1bf54b 100644
+--- a/qtwebengine/src/core/type_conversion.h
++++ b/qtwebengine/src/core/type_conversion.h
+@@ -122,6 +122,11 @@ inline QColor toQt(const SkColor &c)
+     return QColor(SkColorGetR(c), SkColorGetG(c), SkColorGetB(c), SkColorGetA(c));
+ }
+ 
++inline SkColor toSk(const QColor &c)
++{
++    return c.rgba();
++}
++
+ inline QMatrix4x4 toQt(const SkMatrix44 &m)
+ {
+     QMatrix4x4 qtMatrix(
+diff --git a/qtwebengine/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
+index 8c13035..0c5b6ca 100644
+--- a/qtwebengine/src/core/web_contents_adapter.cpp
++++ b/qtwebengine/src/core/web_contents_adapter.cpp
+@@ -837,6 +837,13 @@ void WebContentsAdapter::filesSelectedInChooser(const QStringList &fileList, Web
+     rvh->FilesSelectedInChooser(toVector<content::FileChooserFileInfo>(files), static_cast<content::FileChooserParams::Mode>(mode));
+ }
+ 
++void WebContentsAdapter::backgroundColorChanged()
++{
++    Q_D(WebContentsAdapter);
++    if (content::RenderWidgetHostView *rwhv = d->webContents->GetRenderWidgetHostView())
++        rwhv->SetBackgroundColor(toSk(d->adapterClient->backgroundColor()));
++}
++
+ content::WebContents *WebContentsAdapter::webContents() const
+ {
+     Q_D(const WebContentsAdapter);
+diff --git a/qtwebengine/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
+index 5ea55c1..929967a 100644
+--- a/qtwebengine/src/core/web_contents_adapter.h
++++ b/qtwebengine/src/core/web_contents_adapter.h
+@@ -120,6 +120,7 @@ public:
+     void grantMouseLockPermission(bool granted);
+ 
+     void dpiScaleChanged();
++    void backgroundColorChanged();
+     QAccessibleInterface *browserAccessible();
+     BrowserContextQt* browserContext();
+     BrowserContextAdapter* browserContextAdapter();
+diff --git a/qtwebengine/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
+index 3ed3ab9..acf3095 100644
+--- a/qtwebengine/src/core/web_contents_adapter_client.h
++++ b/qtwebengine/src/core/web_contents_adapter_client.h
+@@ -152,6 +152,7 @@ public:
+     virtual void selectionChanged() = 0;
+     virtual QRectF viewportRect() const = 0;
+     virtual qreal dpiScale() const = 0;
++    virtual QColor backgroundColor() const = 0;
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
+     virtual void loadCommitted() = 0;
+     virtual void loadVisuallyCommitted() = 0;
+diff --git a/qtwebengine/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp
+index 9321706..f40bf8f 100644
+--- a/qtwebengine/src/core/web_contents_view_qt.cpp
++++ b/qtwebengine/src/core/web_contents_view_qt.cpp
+@@ -81,6 +81,13 @@ content::RenderWidgetHostViewBase* WebContentsViewQt::CreateViewForPopupWidget(c
+     return view;
+ }
+ 
++void WebContentsViewQt::RenderViewCreated(content::RenderViewHost* host)
++{
++    // The render process is done creating the RenderView and it's ready to be routed
++    // messages at this point.
++    host->GetView()->SetBackgroundColor(toSk(m_client->backgroundColor()));
++}
++
+ void WebContentsViewQt::CreateView(const gfx::Size& initial_size, gfx::NativeView context)
+ {
+     // This is passed through content::WebContents::CreateParams::context either as the native view's client
+diff --git a/qtwebengine/src/core/web_contents_view_qt.h b/src/core/web_contents_view_qt.h
+index 896955f..3ede530 100644
+--- a/qtwebengine/src/core/web_contents_view_qt.h
++++ b/qtwebengine/src/core/web_contents_view_qt.h
+@@ -75,7 +75,7 @@ public:
+ 
+     virtual void SetPageTitle(const base::string16& title) Q_DECL_OVERRIDE { }
+ 
+-    virtual void RenderViewCreated(content::RenderViewHost* host) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
++    virtual void RenderViewCreated(content::RenderViewHost* host) Q_DECL_OVERRIDE;
+ 
+     virtual void RenderViewSwappedIn(content::RenderViewHost* host) Q_DECL_OVERRIDE { QT_NOT_YET_IMPLEMENTED }
+ 
+diff --git a/qtwebengine/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
+index 7405cae..c57d8d1 100644
+--- a/qtwebengine/src/webengine/api/qquickwebengineview.cpp
++++ b/qtwebengine/src/webengine/api/qquickwebengineview.cpp
+@@ -104,6 +104,7 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
+     , isLoading(false)
+     , devicePixelRatio(QGuiApplication::primaryScreen()->devicePixelRatio())
+     , m_dpiScale(1.0)
++    , m_backgroundColor(Qt::white)
+ {
+     // The gold standard for mobile web content is 160 dpi, and the devicePixelRatio expected
+     // is the (possibly quantized) ratio of device dpi to 160 dpi.
+@@ -310,6 +311,11 @@ qreal QQuickWebEngineViewPrivate::dpiScale() const
+     return m_dpiScale;
+ }
+ 
++QColor QQuickWebEngineViewPrivate::backgroundColor() const
++{
++    return m_backgroundColor;
++}
++
+ void QQuickWebEngineViewPrivate::loadStarted(const QUrl &provisionalUrl, bool isErrorPage)
+ {
+     Q_Q(QQuickWebEngineView);
+@@ -858,6 +864,34 @@ qreal QQuickWebEngineView::zoomFactor() const
+     return d->adapter->currentZoomFactor();
+ }
+ 
++/*!
++    \qmlproperty bool WebEngineView::backgroundColor
++    \since QtWebEngine 1.3
++
++    Sets this property to change the color of the WebEngineView's background,
++    behing the document's body. You can set it to "transparent" or to a translucent
++    color to see through the document, or you can set this color to match your
++    web content in an hybrid app to prevent the white flashes that may appear
++    during loading.
++
++    The default value is white.
++*/
++QColor QQuickWebEngineView::backgroundColor() const
++{
++    Q_D(const QQuickWebEngineView);
++    return d->m_backgroundColor;
++}
++
++void QQuickWebEngineView::setBackgroundColor(const QColor &color)
++{
++    Q_D(QQuickWebEngineView);
++    if (color == d->m_backgroundColor)
++        return;
++    d->m_backgroundColor = color;
++    d->ensureContentsAdapter();
++    d->adapter->backgroundColorChanged();
++    emit backgroundColorChanged();
++}
+ 
+ bool QQuickWebEngineView::isFullScreen() const
+ {
+diff --git a/qtwebengine/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
+index 40299c1..362c3a2 100644
+--- a/qtwebengine/src/webengine/api/qquickwebengineview_p.h
++++ b/qtwebengine/src/webengine/api/qquickwebengineview_p.h
+@@ -89,6 +89,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
+     Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL REVISION 1)
+     Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1)
+     Q_PROPERTY(QQmlListProperty<QQuickWebEngineScript> userScripts READ userScripts FINAL)
++    Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 1)
+ 
+ #ifdef ENABLE_QML_TESTSUPPORT_API
+     Q_PROPERTY(QQuickWebEngineTestSupport *testSupport READ testSupport WRITE setTestSupport FINAL)
+@@ -118,6 +119,8 @@ public:
+     bool isFullScreen() const;
+     qreal zoomFactor() const;
+     void setZoomFactor(qreal arg);
++    QColor backgroundColor() const;
++    void setBackgroundColor(const QColor &color);
+ 
+     QQuickWebEngineViewExperimental *experimental() const;
+ 
+@@ -230,7 +233,7 @@ Q_SIGNALS:
+     Q_REVISION(1) void zoomFactorChanged(qreal arg);
+     Q_REVISION(1) void profileChanged();
+     Q_REVISION(1) void webChannelChanged();
+-
++    Q_REVISION(1) void backgroundColorChanged();
+ 
+ protected:
+     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+diff --git a/qtwebengine/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
+index edc8c1a..3bfed2f 100644
+--- a/qtwebengine/src/webengine/api/qquickwebengineview_p_p.h
++++ b/qtwebengine/src/webengine/api/qquickwebengineview_p_p.h
+@@ -123,6 +123,7 @@ public:
+     virtual void selectionChanged() Q_DECL_OVERRIDE { }
+     virtual QRectF viewportRect() const Q_DECL_OVERRIDE;
+     virtual qreal dpiScale() const Q_DECL_OVERRIDE;
++    virtual QColor backgroundColor() const Q_DECL_OVERRIDE;
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) Q_DECL_OVERRIDE;
+     virtual void loadCommitted() Q_DECL_OVERRIDE;
+     virtual void loadVisuallyCommitted() Q_DECL_OVERRIDE;
+@@ -192,6 +193,7 @@ private:
+     QScopedPointer<QtWebEngineCore::UIDelegatesManager> m_uIDelegatesManager;
+     QList<QQuickWebEngineScript *> m_userScripts;
+     qreal m_dpiScale;
++    QColor m_backgroundColor;
+ };
+ 
+ #ifndef QT_NO_ACCESSIBILITY
+diff --git a/qtwebengine/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
+index ddd0e4d..eb2860b 100644
+--- a/qtwebengine/src/webengine/render_widget_host_view_qt_delegate_quick.h
++++ b/qtwebengine/src/webengine/render_widget_host_view_qt_delegate_quick.h
+@@ -70,6 +70,8 @@ public:
+     virtual void move(const QPoint&) Q_DECL_OVERRIDE { }
+     virtual void inputMethodStateChanged(bool editorVisible) Q_DECL_OVERRIDE;
+     virtual void setTooltip(const QString&) Q_DECL_OVERRIDE { }
++    // The QtQuick view doesn't have a backbuffer of its own and doesn't need this
++    virtual void setClearColor(const QColor &) Q_DECL_OVERRIDE { }
+ 
+ protected:
+     virtual void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE;
+diff --git a/qtwebengine/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h b/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+index cda51a1..a4b0848 100644
+--- a/qtwebengine/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
++++ b/qtwebengine/src/webengine/render_widget_host_view_qt_delegate_quickwindow.h
+@@ -73,6 +73,7 @@ public:
+     virtual void move(const QPoint &screenPos) Q_DECL_OVERRIDE;
+     virtual void inputMethodStateChanged(bool) Q_DECL_OVERRIDE {}
+     virtual void setTooltip(const QString &tooltip) Q_DECL_OVERRIDE;
++    virtual void setClearColor(const QColor &) Q_DECL_OVERRIDE { }
+ 
+ private:
+     QScopedPointer<RenderWidgetHostViewQtDelegate> m_realDelegate;
+diff --git a/qtwebengine/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index 1b5a243..1cd7d6a 100644
+--- a/qtwebengine/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/qtwebengine/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -185,6 +185,7 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile)
+     , view(0)
+     , isLoading(false)
+     , scriptCollection(new QWebEngineScriptCollectionPrivate(browserContextAdapter()->userScriptController(), adapter.data()))
++    , m_backgroundColor(Qt::white)
+ {
+     memset(actions, 0, sizeof(actions));
+ }
+@@ -247,6 +248,11 @@ qreal QWebEnginePagePrivate::dpiScale() const
+     return 1.0;
+ }
+ 
++QColor QWebEnginePagePrivate::backgroundColor() const
++{
++    return m_backgroundColor;
++}
++
+ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isErrorPage)
+ {
+     Q_UNUSED(provisionalUrl);
+@@ -531,6 +537,33 @@ void QWebEnginePage::setWebChannel(QWebChannel *channel)
+     d->adapter->setWebChannel(channel);
+ }
+ 
++/*!
++    \property QWebEnginePage::backgroundColor
++    \brief the page's background color, behing the document's body.
++    \since 5.6
++
++    You can set it to Qt::transparent or to a translucent
++    color to see through the document, or you can set this color to match your
++    web content in an hybrid app to prevent the white flashes that may appear
++    during loading.
++
++    The default value is white.
++*/
++QColor QWebEnginePage::backgroundColor() const
++{
++    Q_D(const QWebEnginePage);
++    return d->m_backgroundColor;
++}
++
++void QWebEnginePage::setBackgroundColor(const QColor &color)
++{
++    Q_D(QWebEnginePage);
++    if (d->m_backgroundColor == color)
++        return;
++    d->m_backgroundColor = color;
++    d->adapter->backgroundColorChanged();
++}
++
+ void QWebEnginePage::setView(QWidget *view)
+ {
+     QWebEngineViewPrivate::bind(qobject_cast<QWebEngineView*>(view), this);
+diff --git a/qtwebengine/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
+index b4cf522..57ed071 100644
+--- a/qtwebengine/src/webenginewidgets/api/qwebenginepage.h
++++ b/qtwebengine/src/webenginewidgets/api/qwebenginepage.h
+@@ -98,6 +98,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
+     Q_PROPERTY(QString title READ title)
+     Q_PROPERTY(QUrl url READ url WRITE setUrl)
+     Q_PROPERTY(QUrl iconUrl READ iconUrl)
++    Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
+ 
+ public:
+     enum WebAction {
+@@ -236,6 +237,8 @@ public:
+ 
+     QWebChannel *webChannel() const;
+     void setWebChannel(QWebChannel *);
++    QColor backgroundColor() const;
++    void setBackgroundColor(const QColor &color);
+ 
+ Q_SIGNALS:
+     void loadStarted();
+diff --git a/qtwebengine/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
+index 8f45ecd..7d74d3f 100644
+--- a/qtwebengine/src/webenginewidgets/api/qwebenginepage_p.h
++++ b/qtwebengine/src/webenginewidgets/api/qwebenginepage_p.h
+@@ -118,6 +118,7 @@ public:
+     virtual void selectionChanged() Q_DECL_OVERRIDE;
+     virtual QRectF viewportRect() const Q_DECL_OVERRIDE;
+     virtual qreal dpiScale() const Q_DECL_OVERRIDE;
++    virtual QColor backgroundColor() const Q_DECL_OVERRIDE;
+     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) Q_DECL_OVERRIDE;
+     virtual void loadCommitted() Q_DECL_OVERRIDE;
+     virtual void loadVisuallyCommitted() Q_DECL_OVERRIDE { }
+@@ -170,6 +171,7 @@ public:
+     QtWebEngineCore::WebEngineContextMenuData m_menuData;
+     bool isLoading;
+     QWebEngineScriptCollection scriptCollection;
++    QColor m_backgroundColor;
+ 
+     mutable CallbackDirectory m_callbacks;
+     mutable QAction *actions[QWebEnginePage::WebActionCount];
+diff --git a/qtwebengine/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+index dba37ce..76ca8d3 100644
+--- a/qtwebengine/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
++++ b/qtwebengine/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
+@@ -59,6 +59,7 @@ RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(Rende
+     , m_rootNode(new QSGRootNode)
+     , m_sgEngine(new QSGEngine)
+     , m_isPopup(false)
++    , m_clearColor(Qt::white)
+ {
+     setFocusPolicy(Qt::StrongFocus);
+ 
+@@ -218,6 +219,19 @@ void RenderWidgetHostViewQtDelegateWidget::setTooltip(const QString &tooltip)
+     setToolTip(wrappedTip);
+ }
+ 
++void RenderWidgetHostViewQtDelegateWidget::setClearColor(const QColor &color)
++{
++    m_clearColor = color;
++    // QOpenGLWidget is usually blended by punching holes into widgets
++    // above it to simulate the visual stacking order. If we want it to be
++    // transparent we have to throw away the proper stacking order and always
++    // blend the complete normal widgets backing store under it.
++    bool isTranslucent = color.alpha() < 255;
++    setAttribute(Qt::WA_AlwaysStackOnTop, isTranslucent);
++    setAttribute(Qt::WA_OpaquePaintEvent, !isTranslucent);
++    update();
++}
++
+ QVariant RenderWidgetHostViewQtDelegateWidget::inputMethodQuery(Qt::InputMethodQuery query) const
+ {
+     return m_client->inputMethodQuery(query);
+@@ -270,7 +284,7 @@ void RenderWidgetHostViewQtDelegateWidget::initializeGL()
+     m_sgEngine->initialize(QOpenGLContext::currentContext());
+     m_sgRenderer.reset(m_sgEngine->createRenderer());
+     m_sgRenderer->setRootNode(m_rootNode.data());
+-    m_sgRenderer->setClearColor(Qt::white);
++    m_sgRenderer->setClearColor(m_clearColor);
+ }
+ 
+ void RenderWidgetHostViewQtDelegateWidget::paintGL()
+diff --git a/qtwebengine/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h b/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+index d0dfdc6..d228bd4 100644
+--- a/qtwebengine/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
++++ b/qtwebengine/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
+@@ -78,6 +78,7 @@ public:
+     virtual void move(const QPoint &screenPos) Q_DECL_OVERRIDE;
+     virtual void inputMethodStateChanged(bool editorVisible) Q_DECL_OVERRIDE;
+     virtual void setTooltip(const QString &tooltip) Q_DECL_OVERRIDE;
++    virtual void setClearColor(const QColor &color) Q_DECL_OVERRIDE;
+ 
+ protected:
+     bool event(QEvent *event) Q_DECL_OVERRIDE;
+@@ -98,6 +99,7 @@ private:
+     QScopedPointer<QSGEngine> m_sgEngine;
+     QScopedPointer<QSGAbstractRenderer> m_sgRenderer;
+     bool m_isPopup;
++    QColor m_clearColor;
+     QList<QMetaObject::Connection> m_windowConnections;
+ };
+ 
+-- 
+2.3.3
+
+
diff --git a/qt-patches/0002-qtbase-Don-t-show-the-menu-bar-at-all-in-lion-style-fullscr.patch b/qt-patches/0002-qtbase-Don-t-show-the-menu-bar-at-all-in-lion-style-fullscr.patch
new file mode 100644
index 0000000..d361b42
--- /dev/null
+++ b/qt-patches/0002-qtbase-Don-t-show-the-menu-bar-at-all-in-lion-style-fullscr.patch
@@ -0,0 +1,27 @@
+From d04cee1adfd944d724c4b8777638c9319f53f443 Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <jturcotte@woboq.com>
+Date: Thu, 23 Jul 2015 11:56:37 +0200
+Subject: [PATCH] Don't show the menu bar at all in lion-style fullscreen
+
+This works around a bug in OSX where the menubar could
+appear and not go away when losing the connection to a
+single main display, which triggers the menu bar to be resized.
+---
+ qtbase/src/plugins/platforms/cocoa/qnswindowdelegate.mm | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/qtbase/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/qtbase/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+index 015274c..37a481a 100644
+--- a/qtbase/src/plugins/platforms/cocoa/qnswindowdelegate.mm
++++ b/qtbase/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+@@ -109,4 +109,7 @@
+     return YES;
+ }
+ 
++- (NSApplicationPresentationOptions)window:(NSWindow *)window willUseFullScreenPresentationOptions:(NSApplicationPresentationOptions)proposedOptions {
++    return NSApplicationPresentationFullScreen | NSApplicationPresentationHideMenuBar | NSApplicationPresentationHideDock;
++}
+ @end
+-- 
+2.3.3
+
diff --git a/qt-patches/0003-Always-enable-viewport-stuff.patch b/qt-patches/0003-Always-enable-viewport-stuff.patch
new file mode 100644
index 0000000..432fce8
--- /dev/null
+++ b/qt-patches/0003-Always-enable-viewport-stuff.patch
@@ -0,0 +1,29 @@
+From 6ca3c5f3430043074f7299cb1c3ba7f453ff7b5f Mon Sep 17 00:00:00 2001
+From: Vincent Lang <vincent@plexapp.com>
+Date: Wed, 29 Jul 2015 21:27:34 +0200
+Subject: [PATCH] Always enable viewport stuff
+
+Normally, applications can configure this by changing the command
+line passed to QApplication/QtWebEngine, but this doesn't work on
+Windows. So we change these directly.
+---
+ src/core/web_engine_context.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/qtwebengine/src/core/web_engine_context.cpp b/qtwebengine/src/core/web_engine_context.cpp
+index 8bc0473..88b6245 100644
+--- a/qtwebengine/src/core/web_engine_context.cpp
++++ b/qtwebengine/src/core/web_engine_context.cpp
+@@ -231,6 +231,9 @@ WebEngineContext::WebEngineContext()
+     parsedCommandLine->AppendSwitchASCII(switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
+ #endif
+ 
++    parsedCommandLine->AppendSwitch(switches::kEnableViewport);
++    parsedCommandLine->AppendSwitch(switches::kEnableViewportMeta);
++
+     GLContextHelper::initialize();
+ 
+     if (usingANGLE() || usingSoftwareDynamicGL() || usingQtQuick2DRenderer()) {
+-- 
+2.4.6
+
diff --git a/qt-patches/0004-qtwebengine-transparency-window-creation.patch b/qt-patches/0004-qtwebengine-transparency-window-creation.patch
new file mode 100644
index 0000000..3c13209
--- /dev/null
+++ b/qt-patches/0004-qtwebengine-transparency-window-creation.patch
@@ -0,0 +1,44 @@
+rom e62ab19d897155bb10f4c7a2a99b901b458361b5 Mon Sep 17 00:00:00 2001
+From: Jocelyn Turcotte <jturcotte@woboq.com>
+Date: Mon, 20 Jul 2015 12:06:59 +0200
+Subject: [PATCH] Fix a crash on new windows
+
+Fixes a regression of 99e98f7bf6aec78fe0d647fb898e65d13ff522e4
+by delaying applying the background color if the client hasn't
+been set on the WebContentsViewQt yet.
+
+Task-number: QTBUG-41960
+Change-Id: I1c138777f616541179976570d8c29f8f4d49ecbf
+---
+ qtwebengine/src/core/web_contents_view_qt.cpp | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/qtwebengine/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp
+index aad44c1..c327534 100644
+--- a/qtwebengine/src/core/web_contents_view_qt.cpp
++++ b/qtwebengine/src/core/web_contents_view_qt.cpp
+@@ -53,8 +53,10 @@ void WebContentsViewQt::initialize(WebContentsAdapterClient* client)
+     m_factoryClient = client;
+
+     // Check if a RWHV was created before the initialization.
+-    if (m_webContents->GetRenderWidgetHostView())
+-        static_cast<RenderWidgetHostViewQt *>(m_webContents->GetRenderWidgetHostView())->setAdapterClient(client);
++    if (auto rwhv = static_cast<RenderWidgetHostViewQt *>(m_webContents->GetRenderWidgetHostView())) {
++        rwhv->setAdapterClient(client);
++        rwhv->SetBackgroundColor(toSk(client->backgroundColor()));
++    }
+ }
+
+ content::RenderWidgetHostViewBase* WebContentsViewQt::CreateViewForWidget(content::RenderWidgetHost* render_widget_host, bool is_guest_view_hack)
+@@ -86,7 +88,8 @@ void WebContentsViewQt::RenderViewCreated(content::RenderViewHost* host)
+ {
+     // The render process is done creating the RenderView and it's ready to be routed
+     // messages at this point.
+-    host->GetView()->SetBackgroundColor(toSk(m_client->backgroundColor()));
++    if (m_client)
++        host->GetView()->SetBackgroundColor(toSk(m_client->backgroundColor()));
+ }
+
+ void WebContentsViewQt::CreateView(const gfx::Size& initial_size, gfx::NativeView context)
+--
+2.3.3
diff --git a/qt-patches/README.md b/qt-patches/README.md
new file mode 100644
index 0000000..14441a7
--- /dev/null
+++ b/qt-patches/README.md
@@ -0,0 +1,14 @@
+In this directory we store all patches against Qt that is required by konvergo. The patches are:
+
+* 0001-qtwebengine-Add-a-backgroundColor-property.patch - Which adds the backgroundColor property to
+  the webengineview. Without this patch playback will not be rendered correctly. Has been submitted upstream
+  and will most likely be included in Qt 5.6
+* 0002-qtbase-Don-t-show-the-menu-bar-at-all-in-lion-style-fullscr.patch - This patch hids the menu bar
+  when we go into fullscreen mode on OS X. Without this patch the menu bar can show up when it's not wanted
+  (for example switching input on your TV). Has not been submitted upstream since it doesn't really fit
+  for other applications.
+* 0003-Always-enable-viewport-stuff.patch - This patch makes sure that the viewport is scalable on windows.
+  Without this one the UI will be rendered in the upper left corner way to small. Has not been submitted
+  upstream since it enables a feature that was intentionally disabled in desktop versions of Qt.
+* 0004-qtwebengine-transparency-window-creation.patch - Fixes a bug in patch 0001. Will be included at the same
+  time as patch 0001.
\ No newline at end of file
diff --git a/qt-patches/qt-5.6-alpha/0001-Windows-Add-checks-to-usages-of-QWindow-screen.patch b/qt-patches/qt-5.6-alpha/0001-Windows-Add-checks-to-usages-of-QWindow-screen.patch
new file mode 100644
index 0000000..073962c
--- /dev/null
+++ b/qt-patches/qt-5.6-alpha/0001-Windows-Add-checks-to-usages-of-QWindow-screen.patch
@@ -0,0 +1,120 @@
+From 78b2719b04f1177b5af0f52fce98316505f9000b Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
+Date: Tue, 22 Sep 2015 12:21:29 +0200
+Subject: [PATCH] Windows: Add checks to usages of QWindow::screen().
+
+Default to primary screen and handle situations where the screen
+is null consistently. Remove unused QWindowsScreen::screenOf() method.
+
+Task-number: QTBUG-48288
+Change-Id: I91b3c2331521d9d3be8ac77606ee820cd35ebb0f
+Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
+---
+ src/plugins/platforms/windows/qwindowsmousehandler.cpp | 14 ++++++++++++--
+ src/plugins/platforms/windows/qwindowsscreen.cpp       | 12 ------------
+ src/plugins/platforms/windows/qwindowsscreen.h         |  2 --
+ src/plugins/platforms/windows/qwindowswindow.cpp       | 12 +++++++++---
+ 4 files changed, 21 insertions(+), 19 deletions(-)
+
+diff --git a/src/plugins/platforms/windows/qwindowsmousehandler.cpp b/src/plugins/platforms/windows/qwindowsmousehandler.cpp
+index 4ab861a..90cb6fe 100644
+--- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp
++++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp
+@@ -477,7 +477,12 @@ bool QWindowsMouseHandler::translateTouchEvent(QWindow *window, HWND,
+     typedef QList<QWindowSystemInterface::TouchPoint> QTouchPointList;
+ 
+     Q_ASSERT(m_touchDevice);
+-    const QRect screenGeometry = window->screen()->geometry();
++    const QScreen *screen = window->screen();
++    if (!screen)
++        screen = QGuiApplication::primaryScreen();
++    if (!screen)
++        return true;
++    const QRect screenGeometry = screen->geometry();
+ 
+     const int winTouchPointCount = msg.wParam;
+     QScopedArrayPointer<TOUCHINPUT> winTouchInputs(new TOUCHINPUT[winTouchPointCount]);
+@@ -569,7 +574,12 @@ bool QWindowsMouseHandler::translateGestureEvent(QWindow *window, HWND hwnd,
+     if (gi.dwID != GID_DIRECTMANIPULATION)
+         return true;
+     static QPoint lastTouchPos;
+-    const QRect screenGeometry = window->screen()->geometry();
++    const QScreen *screen = window->screen();
++    if (!screen)
++        screen = QGuiApplication::primaryScreen();
++    if (!screen)
++        return true;
++    const QRect screenGeometry = screen->geometry();
+     QWindowSystemInterface::TouchPoint touchPoint;
+     static QWindowSystemInterface::TouchPoint touchPoint2;
+     touchPoint.id = 0;//gi.dwInstanceID;
+diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
+index 391735a..e6abfb2 100644
+--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
++++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
+@@ -276,18 +276,6 @@ QWindow *QWindowsScreen::windowAt(const QPoint &screenPoint, unsigned flags)
+     return result;
+ }
+ 
+-QWindowsScreen *QWindowsScreen::screenOf(const QWindow *w)
+-{
+-    if (w)
+-        if (const QScreen *s = w->screen())
+-            if (QPlatformScreen *pscr = s->handle())
+-                return static_cast<QWindowsScreen *>(pscr);
+-    if (const QScreen *ps = QGuiApplication::primaryScreen())
+-        if (QPlatformScreen *ppscr = ps->handle())
+-            return static_cast<QWindowsScreen *>(ppscr);
+-    return 0;
+-}
+-
+ qreal QWindowsScreen::pixelDensity() const
+ {
+     const qreal physicalDpi = m_data.geometry.width() / m_data.physicalSizeMM.width() * qreal(25.4);
+diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
+index 67e7ff6..bc8fbf5 100644
+--- a/src/plugins/platforms/windows/qwindowsscreen.h
++++ b/src/plugins/platforms/windows/qwindowsscreen.h
+@@ -79,8 +79,6 @@ public:
+ 
+     explicit QWindowsScreen(const QWindowsScreenData &data);
+ 
+-    static QWindowsScreen *screenOf(const QWindow *w = 0);
+-
+     QRect geometry() const Q_DECL_OVERRIDE { return m_data.geometry; }
+     QRect availableGeometry() const Q_DECL_OVERRIDE { return m_data.availableGeometry; }
+     int depth() const Q_DECL_OVERRIDE { return m_data.depth; }
+diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
+index 5318360..abfddcf 100644
+--- a/src/plugins/platforms/windows/qwindowswindow.cpp
++++ b/src/plugins/platforms/windows/qwindowswindow.cpp
+@@ -1637,8 +1637,12 @@ void QWindowsWindow::setWindowState(Qt::WindowState state)
+ bool QWindowsWindow::isFullScreen_sys() const
+ {
+     const QWindow *w = window();
+-    return w->isTopLevel()
+-        && geometry_sys() == QHighDpi::toNativePixels(w->screen()->geometry(), w);
++    if (!w->isTopLevel())
++        return false;
++    const QScreen *screen = w->screen();
++    if (!screen)
++        screen = QGuiApplication::primaryScreen();
++    return screen && geometry_sys() == QHighDpi::toNativePixels(screen->geometry(), w);
+ }
+ 
+ /*!
+@@ -1708,7 +1712,9 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState)
+             // Use geometry of QWindow::screen() within creation or the virtual screen the
+             // window is in (QTBUG-31166, QTBUG-30724).
+             const QScreen *screen = window()->screen();
+-            const QRect r = QHighDpi::toNativePixels(screen->geometry(), window());
++            if (!screen)
++                screen = QGuiApplication::primaryScreen();
++            const QRect r = screen ? QHighDpi::toNativePixels(screen->geometry(), window()) : m_savedFrameGeometry;
+             const UINT swpf = SWP_FRAMECHANGED | SWP_NOACTIVATE;
+             const bool wasSync = testFlag(SynchronousGeometryChangeEvent);
+             setFlag(SynchronousGeometryChangeEvent);
+-- 
+2.5.1
+
+
diff --git a/qt-patches/qt-5.6-alpha/0002-windows-Improve-error-handling-with-EGL.patch b/qt-patches/qt-5.6-alpha/0002-windows-Improve-error-handling-with-EGL.patch
new file mode 100644
index 0000000..f4e734c
--- /dev/null
+++ b/qt-patches/qt-5.6-alpha/0002-windows-Improve-error-handling-with-EGL.patch
@@ -0,0 +1,151 @@
+From 867fc30c7c9be51b4b3813d2cc558b5a9df0256d Mon Sep 17 00:00:00 2001
+From: Laszlo Agocs <laszlo.agocs@digia.com>
+Date: Wed, 23 Sep 2015 14:38:48 +0200
+Subject: [PATCH] windows: Improve error handling with EGL
+
+When disabling the graphics adapter, things start failing
+with context lost and then bad_alloc and bad_access failures
+when creating contexts/window surfaces.
+
+Swap buffers now handles context loss. This makes it possible
+for Qt Quick to act when the graphics adapter goes away.
+
+Similarly, the window surface creation failure EGL_BAD_ACCESS
+is treated the same way as context loss.
+
+Note that this will not really help the main issue, because
+rendering is not possible without a GPU (reinit attempts will
+fail either at context creation or window surface creation),
+but proper logging and context loss reporting improves the
+situation somewhat.
+
+Also unify and prettyify the warning and debug prints.
+This makes it easier to understand what is going on.
+
+Change-Id: Iec3a9b54f1134e78e87eefcf938525283ec9412a
+Task-number: QTBUG-48095
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
+---
+ .../platforms/windows/qwindowseglcontext.cpp       | 43 ++++++++++++++++------
+ 1 file changed, 31 insertions(+), 12 deletions(-)
+
+diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
+index 06c9985..e4ec3f3 100644
+--- a/src/plugins/platforms/windows/qwindowseglcontext.cpp
++++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp
+@@ -350,16 +350,16 @@ QWindowsEGLStaticContext *QWindowsEGLStaticContext::create(QWindowsOpenGLTester:
+ {
+     const HDC dc = QWindowsContext::instance()->displayContext();
+     if (!dc){
+-        qWarning("%s: No Display", Q_FUNC_INFO);
++        qWarning("%s: No Display", __FUNCTION__);
+         return 0;
+     }
+ 
+     if (!libEGL.init()) {
+-        qWarning("%s: Failed to load and resolve libEGL functions", Q_FUNC_INFO);
++        qWarning("%s: Failed to load and resolve libEGL functions", __FUNCTION__);
+         return 0;
+     }
+     if (!libGLESv2.init()) {
+-        qWarning("%s: Failed to load and resolve libGLESv2 functions", Q_FUNC_INFO);
++        qWarning("%s: Failed to load and resolve libGLESv2 functions", __FUNCTION__);
+         return 0;
+     }
+ 
+@@ -396,15 +396,15 @@ QWindowsEGLStaticContext *QWindowsEGLStaticContext::create(QWindowsOpenGLTester:
+     if (display == EGL_NO_DISPLAY)
+         display = libEGL.eglGetDisplay((EGLNativeDisplayType)dc);
+     if (!display) {
+-        qWarning("%s: Could not obtain EGL display", Q_FUNC_INFO);
++        qWarning("%s: Could not obtain EGL display", __FUNCTION__);
+         return 0;
+     }
+ 
+     if (!major && !libEGL.eglInitialize(display, &major, &minor)) {
+         int err = libEGL.eglGetError();
+-        qWarning("%s: Could not initialize EGL display: error 0x%x\n", Q_FUNC_INFO, err);
++        qWarning("%s: Could not initialize EGL display: error 0x%x", __FUNCTION__, err);
+         if (err == 0x3001)
+-            qWarning("%s: When using ANGLE, check if d3dcompiler_4x.dll is available", Q_FUNC_INFO);
++            qWarning("%s: When using ANGLE, check if d3dcompiler_4x.dll is available", __FUNCTION__);
+         return 0;
+     }
+ 
+@@ -430,7 +430,7 @@ void *QWindowsEGLStaticContext::createWindowSurface(void *nativeWindow, void *na
+                                                        (EGLNativeWindowType) nativeWindow, 0);
+     if (surface == EGL_NO_SURFACE) {
+         *err = libEGL.eglGetError();
+-        qWarning("%s: Could not create the EGL window surface: 0x%x\n", Q_FUNC_INFO, *err);
++        qWarning("%s: Could not create the EGL window surface: 0x%x", __FUNCTION__, *err);
+     }
+ 
+     return surface;
+@@ -533,7 +533,12 @@ QWindowsEGLContext::QWindowsEGLContext(QWindowsEGLStaticContext *staticContext,
+     }
+ 
+     if (m_eglContext == EGL_NO_CONTEXT) {
+-        qWarning("QWindowsEGLContext: eglError: %x, this: %p \n", QWindowsEGLStaticContext::libEGL.eglGetError(), this);
++        int err = QWindowsEGLStaticContext::libEGL.eglGetError();
++        qWarning("QWindowsEGLContext: Failed to create context, eglError: %x, this: %p", err, this);
++        // ANGLE gives bad alloc when it fails to reset a previously lost D3D device.
++        // A common cause for this is disabling the graphics adapter used by the app.
++        if (err == EGL_BAD_ALLOC)
++            qWarning("QWindowsEGLContext: Graphics device lost. (Did the adapter get disabled?)");
+         return;
+     }
+ 
+@@ -594,6 +599,12 @@ bool QWindowsEGLContext::makeCurrent(QPlatformSurface *surface)
+         if (err == EGL_CONTEXT_LOST) {
+             m_eglContext = EGL_NO_CONTEXT;
+             qCDebug(lcQpaGl) << "Got EGL context lost in createWindowSurface() for context" << this;
++        } else if (err == EGL_BAD_ACCESS) {
++            // With ANGLE this means no (D3D) device and can happen when disabling/changing graphics adapters.
++            qCDebug(lcQpaGl) << "Bad access (missing device?) in createWindowSurface() for context" << this;
++            // Simulate context loss as the context is useless.
++            QWindowsEGLStaticContext::libEGL.eglDestroyContext(m_eglDisplay, m_eglContext);
++            m_eglContext = EGL_NO_CONTEXT;
+         }
+         return false;
+     }
+@@ -623,7 +634,7 @@ bool QWindowsEGLContext::makeCurrent(QPlatformSurface *surface)
+             // Drop the surface. Will recreate on the next makeCurrent.
+             window->invalidateSurface();
+         } else {
+-            qWarning("QWindowsEGLContext::makeCurrent: eglError: %x, this: %p \n", err, this);
++            qWarning("%s: Failed to make surface current. eglError: %x, this: %p", __FUNCTION__, err, this);
+         }
+     }
+ 
+@@ -635,7 +646,8 @@ void QWindowsEGLContext::doneCurrent()
+     QWindowsEGLStaticContext::libEGL.eglBindAPI(m_api);
+     bool ok = QWindowsEGLStaticContext::libEGL.eglMakeCurrent(m_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+     if (!ok)
+-        qWarning("QWindowsEGLContext::doneCurrent: eglError: %d, this: %p \n", QWindowsEGLStaticContext::libEGL.eglGetError(), this);
++        qWarning("%s: Failed to make no context/surface current. eglError: %d, this: %p", __FUNCTION__,
++                 QWindowsEGLStaticContext::libEGL.eglGetError(), this);
+ }
+ 
+ void QWindowsEGLContext::swapBuffers(QPlatformSurface *surface)
+@@ -653,8 +665,15 @@ void QWindowsEGLContext::swapBuffers(QPlatformSurface *surface)
+     }
+ 
+     bool ok = QWindowsEGLStaticContext::libEGL.eglSwapBuffers(m_eglDisplay, eglSurface);
+-    if (!ok)
+-        qWarning("QWindowsEGLContext::swapBuffers: eglError: %d, this: %p \n", QWindowsEGLStaticContext::libEGL.eglGetError(), this);
++    if (!ok) {
++        err =  QWindowsEGLStaticContext::libEGL.eglGetError();
++        if (err == EGL_CONTEXT_LOST) {
++            m_eglContext = EGL_NO_CONTEXT;
++            qCDebug(lcQpaGl) << "Got EGL context lost in eglSwapBuffers()";
++        } else {
++            qWarning("%s: Failed to swap buffers. eglError: %d, this: %p", __FUNCTION__, err, this);
++        }
++    }
+ }
+ 
+ QFunctionPointer QWindowsEGLContext::getProcAddress(const QByteArray &procName)
+-- 
+2.5.1
+
+
diff --git a/qt-patches/qt-5.6-alpha/0003-QPlatformWindow-Extract-static-method-for-closestAcc.patch b/qt-patches/qt-5.6-alpha/0003-QPlatformWindow-Extract-static-method-for-closestAcc.patch
new file mode 100644
index 0000000..659ec8c
--- /dev/null
+++ b/qt-patches/qt-5.6-alpha/0003-QPlatformWindow-Extract-static-method-for-closestAcc.patch
@@ -0,0 +1,85 @@
+From 42c6ea4f6c29845d68e865b19a73a09cc6d0bdbe Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
+Date: Tue, 15 Sep 2015 12:12:51 +0200
+Subject: [PATCH] QPlatformWindow: Extract static method for
+ closestAcceptableGeometry().
+
+On Windows, some messages occur before a QPlatformWindow is actually
+created, for example WM_WINDOWPOSCHANGING, which is handled in
+QWindowsWindow::handleGeometryChangingMessage().
+
+Extract a static function QPlatformWindow::closestAcceptableGeometry()
+from QPlatformWindow::windowClosestAcceptableGeometry() and use
+that in QWindowsWindow::handleGeometryChangingMessage().
+
+This fixes a regression crash occurring in Qt 5.6 when running
+the example from QTBUG-48201.
+
+Task-number: QTBUG-36220
+Task-number: QTBUG-48201
+Task-number: QTBUG-46615
+Change-Id: I86b8f923447c8e447382427cf5795628ef1c9717
+Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
+---
+ src/gui/kernel/qplatformwindow.cpp               | 11 ++++++++---
+ src/gui/kernel/qplatformwindow.h                 |  1 +
+ src/plugins/platforms/windows/qwindowswindow.cpp |  2 +-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
+index 0430d5a..ea3b75c 100644
+--- a/src/gui/kernel/qplatformwindow.cpp
++++ b/src/gui/kernel/qplatformwindow.cpp
+@@ -702,15 +702,20 @@ QRect QPlatformWindow::windowFrameGeometry() const
+     a resize/move event for platforms that support it, for example to
+     implement heightForWidth().
+ */
+-QRectF QPlatformWindow::windowClosestAcceptableGeometry(const QRectF &nativeRect) const
++
++QRectF QPlatformWindow::closestAcceptableGeometry(const QWindow *qWindow, const QRectF &nativeRect)
+ {
+-    QWindow *qWindow = window();
+     const QRectF rectF = QHighDpi::fromNativePixels(nativeRect, qWindow);
+-    const QRectF correctedGeometryF = qt_window_private(qWindow)->closestAcceptableGeometry(rectF);
++    const QRectF correctedGeometryF = qt_window_private(const_cast<QWindow *>(qWindow))->closestAcceptableGeometry(rectF);
+     return !correctedGeometryF.isEmpty() && rectF != correctedGeometryF
+         ? QHighDpi::toNativePixels(correctedGeometryF, qWindow) : nativeRect;
+ }
+ 
++QRectF QPlatformWindow::windowClosestAcceptableGeometry(const QRectF &nativeRect) const
++{
++    return QPlatformWindow::closestAcceptableGeometry(window(), nativeRect);
++}
++
+ /*!
+     \class QPlatformWindow
+     \since 4.8
+diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h
+index 1b283db..9c28179 100644
+--- a/src/gui/kernel/qplatformwindow.h
++++ b/src/gui/kernel/qplatformwindow.h
+@@ -140,6 +140,7 @@ public:
+     QRect windowGeometry() const;
+     QRect windowFrameGeometry() const;
+     QRectF windowClosestAcceptableGeometry(const QRectF &nativeRect) const;
++    static QRectF closestAcceptableGeometry(const QWindow *w, const QRectF &nativeRect);
+ 
+ protected:
+     static QString formatWindowTitle(const QString &title, const QString &separator);
+diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
+index f9b3433..5318360 100644
+--- a/src/plugins/platforms/windows/qwindowswindow.cpp
++++ b/src/plugins/platforms/windows/qwindowswindow.cpp
+@@ -1825,7 +1825,7 @@ bool QWindowsWindow::handleGeometryChangingMessage(MSG *message, const QWindow *
+     const QRect suggestedFrameGeometry(windowPos->x, windowPos->y,
+                                        windowPos->cx, windowPos->cy);
+     const QRect suggestedGeometry = suggestedFrameGeometry - margins;
+-    const QRectF correctedGeometryF = qWindow->handle()->windowClosestAcceptableGeometry(suggestedGeometry);
++    const QRectF correctedGeometryF = QPlatformWindow::closestAcceptableGeometry(qWindow, suggestedGeometry);
+     if (!correctedGeometryF.isValid())
+         return false;
+     const QRect correctedFrameGeometry = correctedGeometryF.toRect() + margins;
+-- 
+2.5.1
+
+
diff --git a/qt-patches/qt-5.6-alpha/0004-chromium-create-wakeup-pipe-with-O_CLOEXEC.patch b/qt-patches/qt-5.6-alpha/0004-chromium-create-wakeup-pipe-with-O_CLOEXEC.patch
new file mode 100644
index 0000000..2ababbc
--- /dev/null
+++ b/qt-patches/qt-5.6-alpha/0004-chromium-create-wakeup-pipe-with-O_CLOEXEC.patch
@@ -0,0 +1,40 @@
+From af4993f6ad442816be12ad609544ac56e2ed4cee Mon Sep 17 00:00:00 2001
+From: Vincent Lang <vincent@plexapp.com>
+Date: Mon, 12 Oct 2015 19:24:54 +0200
+Subject: [PATCH] chromium: create wakeup pipe with O_CLOEXEC
+
+Since the sandbox thread is terminated by closing the pipe, forked
+processes could keep the pipe alive for a longer time than intended,
+and freeze RenderSandboxHostLinux::~RenderSandboxHostLinux().
+
+This is all Linux-specific code, so use the glibc-specific pipe2()
+function.
+---
+ .../content/browser/renderer_host/render_sandbox_host_linux.cc        | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc b/src/3rdparty/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc
+index 5b26054..c7b3cdd 100644
+--- a/src/3rdparty/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc
++++ b/src/3rdparty/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc
+@@ -5,6 +5,8 @@
+ #include "content/browser/renderer_host/render_sandbox_host_linux.h"
+ 
+ #include <sys/socket.h>
++#include <fcntl.h>
++#include <unistd.h>
+ 
+ #include "base/memory/singleton.h"
+ #include "base/posix/eintr_wrapper.h"
+@@ -45,7 +47,7 @@ void RenderSandboxHostLinux::Init() {
+   PCHECK(0 == shutdown(browser_socket, SHUT_WR)) << "shutdown";
+ 
+   int pipefds[2];
+-  CHECK(0 == pipe(pipefds));
++  CHECK(0 == pipe2(pipefds, O_CLOEXEC));
+   const int child_lifeline_fd = pipefds[0];
+   childs_lifeline_fd_ = pipefds[1];
+ 
+-- 
+2.5.1
+
diff --git a/resources/images/icon.png b/resources/images/icon.png
new file mode 100644
index 0000000..2ebea44
Binary files /dev/null and b/resources/images/icon.png differ
diff --git a/resources/images/splash.png b/resources/images/splash.png
new file mode 100644
index 0000000..8054585
Binary files /dev/null and b/resources/images/splash.png differ
diff --git a/resources/images/splash.svg b/resources/images/splash.svg
new file mode 100644
index 0000000..46d1973
--- /dev/null
+++ b/resources/images/splash.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="3086px" height="1000px" viewBox="0 0 3086 1000" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.2.2 (9983) - http://www.bohemiancoding.com/sketch -->
+    <title>plex-logo-light</title>
+    <desc>Created with Sketch.</desc>
+    <defs>
+        <radialGradient cx="89.2670157%" cy="49.76%" fx="89.2670157%" fy="49.76%" r="92.4996161%" id="radialGradient-1">
+            <stop stop-color="#F9BE03" offset="0%"></stop>
+            <stop stop-color="#CC7C19" offset="100%"></stop>
+        </radialGradient>
+    </defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="plex-logo-light" sketch:type="MSArtboardGroup">
+            <g sketch:type="MSLayerGroup">
+                <path d="M3085.99,0 L2795.989,0 L2505.99,500 L2795.989,1000 L3085.737,1000 L2795.989,500.25 L3085.99,0" id="X" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+                <path d="M2186,0 L2476.00071,0 L2796,500.25 L2476.00071,1000.5 L2186,1000.5 L2505.99929,500.25 L2186,0" id="chevron" fill="url(#radialGradient-1)" sketch:type="MSShapeGroup"></path>
+                <path d="M2085.947,1000 L1508.874,1000 L1508.874,0 L2085.947,0 L2085.947,173.737 L1721.339,173.737 L1721.339,393.299 L2060.594,393.299 L2060.594,567.03 L1721.339,567.03 L1721.339,824.895 L2085.947,824.895 L2085.947,1000" id="E" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+                <path d="M791.276,1000 L791.276,0 L1003.316,0 L1003.316,824.895 L1408.925,824.895 L1408.925,1000 L791.276,1000" id="L" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+                <g id="P" fill="#FFFFFF" sketch:type="MSShapeGroup">
+                    <path d="M589.947,558.824 C522.679,615.831 427.037,644.325 303.009,644.325 L212.04,644.325 L212.04,1000 L0,1000 L0,643.947829 L0,470.337388 L290,470.697418 C467.563171,468.627777 476.842468,359.878967 476.842468,322.200012 C476.842468,287.221283 476.842468,175.445374 319,173.699997 L0,173.703242 L0,0 L319.424,0 C440.717,0 532.939,26.107 596.101,78.321 C659.253,130.534 690.834,208.392 690.834,311.902 C690.834,419.527 657.202,501.83 589.947,558.824 Z" id="Path"></path>
+                    <rect id="Path" x="0" y="110" width="212.2" height="429"></rect>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/resources/inputmaps/LIRC.json b/resources/inputmaps/LIRC.json
new file mode 100644
index 0000000..68dd8c3
--- /dev/null
+++ b/resources/inputmaps/LIRC.json
@@ -0,0 +1,33 @@
+{
+ "name": "LIRC IR",
+ "idmatcher": "LIRC*",
+ "mapping":
+ {
+     "KEY_LEFT": "left",
+     "KEY_RIGHT": "right",
+     "KEY_UP": "up",
+     "KEY_DOWN": "down",
+     "KEY_MENU": "unknown",
+     "KEY_SELECT": "enter",
+     "KEY_OK": "enter",
+     "KEY_BACK": "back",
+     "KEY_EXIT": "back",
+     "KEY_RED": "red",
+     "KEY_GREEN": "green",
+     "KEY_YELLOW": "yellow",
+     "KEY_BLUE": "blue",
+     "KEY_PLAY": "play",
+     "KEY_STOP": "stop",
+     "KEY_PAUSE": "pause",
+     "KEY_SEEKFWD": "seek_forward",
+     "KEY_FASTFORWARD" : "seek_forward",
+     "KEY_SEEKBCK": "seek_backward",
+     "KEY_REWIND": "seek_backward",
+     "KEY_SUBTITLES": "cycle_subtitles",
+     "KEY_INFO": "unknown",
+     "KEY_NEXT": "step_forward",
+     "KEY_PREV": "step_backward",
+     "KEY_HOME": "home",
+     "KEY_NUMERIC_([0-9])": "%1"
+ }
+}
diff --git a/resources/inputmaps/apple-media-keys.json b/resources/inputmaps/apple-media-keys.json
new file mode 100644
index 0000000..192a4c7
--- /dev/null
+++ b/resources/inputmaps/apple-media-keys.json
@@ -0,0 +1,12 @@
+{
+  "name": "Apple Media Keys",
+  "idmatcher": "AppleMediaKeys.*",
+  "mapping":
+  {
+    "KEY_PLAY": "play_pause",
+    "KEY_NEXT": "step_forward",
+    "KEY_PREV": "step_backward",
+    "KEY_FAST": "step_forward",
+    "KEY_REWIND": "step_backward"
+  }
+}
diff --git a/resources/inputmaps/apple-remote.json b/resources/inputmaps/apple-remote.json
new file mode 100644
index 0000000..259d0a6
--- /dev/null
+++ b/resources/inputmaps/apple-remote.json
@@ -0,0 +1,19 @@
+{
+  "name": "Apple Remote",
+  "idmatcher": "AppleRemote.*",
+  "mapping": 
+  {
+      "KEY_LEFT": "left",
+      "KEY_LEFT_LONG": "cycle_subtitles_back",
+      "KEY_RIGHT": "right",
+      "KEY_RIGHT_LONG": "cycle_subtitles",
+      "KEY_UP": "up",
+      "KEY_UP_LONG": "cycle_audio",
+      "KEY_DOWN": "down",
+      "KEY_DOWN_LONG": "cycle_audio_back",
+      "KEY_SELECT": "enter",
+      "KEY_SELECT_LONG": "host:toggleDebug",
+      "KEY_MENU": "back",
+      "KEY_MENU_LONG": "home"
+  }
+}
\ No newline at end of file
diff --git a/resources/inputmaps/cec.json b/resources/inputmaps/cec.json
new file mode 100644
index 0000000..02bc875
--- /dev/null
+++ b/resources/inputmaps/cec.json
@@ -0,0 +1,30 @@
+{
+ "name": "HDMI CEC",
+ "idmatcher": "CEC.*",
+ "mapping": 
+ {
+     "KEY_LEFT": "left",
+     "KEY_RIGHT": "right",
+     "KEY_UP": "up",
+     "KEY_DOWN": "down",
+     "KEY_MENU": "unknown",
+     "KEY_SELECT": "enter",
+     "KEY_BACK": "back",
+     "KEY_RED": "red",
+     "KEY_GREEN": "green",
+     "KEY_YELLOW": "yellow",
+     "KEY_BLUE": "blue",
+     "KEY_PLAY": "play",
+     "KEY_STOP": "stop",
+     "KEY_PAUSE": "pause",
+     "KEY_SEEKFWD": "seek_forward",
+     "KEY_SEEKBCK": "seek_backward",
+     "KEY_SUBTITLES": "cycle_subtitles",
+     "KEY_INFO": "unknown",
+     "KEY_NEXT": "step_forward",
+     "KEY_PREV": "step_backward",
+     "KEY_HOME": "home",
+     "KEY_NUMERIC_([0-9])": "%1",
+     "KEY_GUIDE": "guide"
+ }
+} 
\ No newline at end of file
diff --git a/resources/inputmaps/keyboard.json b/resources/inputmaps/keyboard.json
new file mode 100644
index 0000000..a747c8c
--- /dev/null
+++ b/resources/inputmaps/keyboard.json
@@ -0,0 +1,44 @@
+{
+  "name": "Keyboard Generic",
+  "idmatcher": "Keyboard.*",
+  "mapping":
+  {
+    // standard navigation, we allow num and shift modifiers
+    "(Num\\+|Shift\\+)?Left": "left",
+    "(Num\\+|Shift\\+)?Right": "right",
+    "(Num\\+|Shift\\+)?Up": "up",
+    "(Num\\+|Shift\\+)?Down": "down",
+    "(Num\\+)?(Return|Enter|Space)": "enter",
+    "(Esc|Backspace)": "back",
+
+    // map Num+X and Shift+X to X. This allows normal number input
+    "(?:Num\\+|Shift\\+)?([0-9])": "%1",
+
+    // map Shift+Letter to action jump+letter
+    "Shift\\+([A-Z])": "jump+%1",
+
+    "P": "play_pause",
+    "Ctrl\\+P": "pause",
+    "X": "stop",
+    "B": "back",
+    "H": "home",
+    "A": "cycle_audio",
+    "Ctrl\\+A": "cycle_audio_back",
+    "L": "cycle_subtitles",
+    "Ctrl\\+L": "cycle_subtitles_back",
+    "S": "toggle_subtitles",
+    "Alt\\+A": "increase_audio_delay",
+    "Alt+Shift\\+A": "decrease_audio_delay",
+    "Alt\\+S": "increase_subtitles_delay",
+    "Alt\\+Shift\\+S": "decrease_subtitles_delay",
+
+    // application shortcuts
+    "Ctrl\\+F": "host:fullscreen",
+    "Ctrl\\+Q": "host:close",
+    "Ctrl\\+Shift\\+R": "host:reload",
+    "Ctrl\\+Shift\\+D": "host:toggleDebug",
+
+    // debug command to crash the host. for testing
+    "Ctrl\\+Alt\\+Shift\\+F1": "host:crash!"
+  }
+}
diff --git a/resources/inputmaps/wiimote.json b/resources/inputmaps/wiimote.json
new file mode 100644
index 0000000..e381369
--- /dev/null
+++ b/resources/inputmaps/wiimote.json
@@ -0,0 +1,13 @@
+{
+  "name": "Wiimote",
+  "idmatcher": "Wiimote.*",
+  "mapping": 
+  {
+      "KEY_BUTTON_1": "up",
+      "KEY_BUTTON_3": "right",
+      "KEY_BUTTON_0": "down",
+      "KEY_BUTTON_2": "left",
+      "KEY_BUTTON_10": "enter",
+      "KEY_BUTTON_9": "back"
+  }
+}
diff --git a/resources/inputmaps/xbox-controller.json b/resources/inputmaps/xbox-controller.json
new file mode 100644
index 0000000..1ac9e88
--- /dev/null
+++ b/resources/inputmaps/xbox-controller.json
@@ -0,0 +1,14 @@
+{
+  "name": "Xbox Controller",
+  "idmatcher": "Xbox.*",
+  "mapping": 
+  {
+      "KEY_BUTTON_13": "left",
+      "KEY_BUTTON_14": "right",
+      "KEY_BUTTON_11": "up",
+      "KEY_BUTTON_12": "down",
+      "KEY_BUTTON_0": "enter",
+      "KEY_BUTTON_1": "back",
+      "KEY_BUTTON_3": "info"
+  }
+}
\ No newline at end of file
diff --git a/resources/settings/settings_description.json b/resources/settings/settings_description.json
new file mode 100644
index 0000000..4b07822
--- /dev/null
+++ b/resources/settings/settings_description.json
@@ -0,0 +1,279 @@
+[
+  {
+    "section": "__meta__",
+    "version": 3
+  },
+  {
+    "section": "state",
+    "hidden": true,
+    "storage": true,
+    "values":[
+      {
+        "value": "geometry",
+        "default": "",
+        "hidden": true
+      }
+    ]
+  },
+  {
+    "section": "main",
+    "values": [
+      {
+        "value": "remoteInspector",
+        "default": false,
+        "hidden": true
+      },
+      {
+        "value": "fullscreen",
+        "default": false,
+        "platforms_excluded": "oe"
+      },
+      {
+        "value": "webserverport",
+        "default": 32433,
+        "hidden": true
+      },
+      {
+        "value": "updateChannel",
+        "default": 4,
+        "possible_values": [
+          [ 0, "Stable" ],
+          [ 8, "PlexPass" ],
+          [ 4, "Ninja" ],
+          [ 2, "Employee" ]
+        ]
+      }
+    ]
+  },
+  {
+    "section": "audio",
+    "values": [
+      {
+        "value": "devicetype",
+        "default": "basic",
+        "possible_values": [
+          [ "basic", "Basic" ],
+          [ "spdif", "Optical (S/PDIF)" ],
+          [ "hdmi", "HDMI" ]
+        ]
+      },
+      {
+        "value": "channels",
+        "default": "2.0",
+        "possible_values": [
+          [ "auto", "Auto Select Channels" ],
+          [ "1.0", "Mono" ],
+          [ "2.0", "Stereo" ],
+          [ "2.1", "2.1" ],
+          [ "3.0", "3.0" ],
+          [ "3.1", "3.1" ],
+          [ "5.1", "5.1" ],
+          [ "7.1", "7.1" ]
+        ]
+      },
+      {
+        "value": "device",
+        "default": "auto"
+      },
+      {
+        "value": "normalize",
+        "default": true
+      },
+      {
+        "value": "advanced",
+        "default": false
+      },
+      {
+        "value": "exclusive",
+        "default": false,
+        "hidden": true,
+        "platforms": [ "osx", "windows" ]
+      },
+      {
+        "value": "passthrough.ac3",
+        "default": false
+      },
+      {
+        "value": "passthrough.dts",
+        "default": false
+      },
+      {
+        "value": "passthrough.eac3",
+        "default": false,
+        "platforms_excluded": [ "osx", "oe_rpi" ]
+      },
+      {
+        "value": "passthrough.dts-hd",
+        "default": false,
+        "platforms_excluded": [ "osx", "oe_rpi" ]
+      },
+      {
+        "value": "passthrough.truehd",
+        "default": false,
+        "platforms_excluded": [ "osx", "oe_rpi" ]
+      }
+    ]
+  },
+  {
+    "section": "video",
+    "values": [
+      {
+        "value": "debug.force_vo",
+        "default": "",
+        "hidden": true
+      },
+      {
+        "value": "refreshrate.auto_switch",
+        "default": false
+      },
+      {
+        "value": "refreshrate.delay",
+        "default": 3,
+        "hidden": true
+      },
+      {
+        "value": "hardware_decoding",
+        "default": true,
+        "platforms_excluded": "oe_rpi"
+      },
+      {
+        "value": "deinterlace",
+        "default": false,
+        "platforms_excluded": "oe_rpi"
+      },
+      {
+        "value": "directPlay",
+        "default": true
+      },
+      {
+        "value": "directStream",
+        "default": true
+      },
+      {
+        "value": "sync_mode",
+        "default": "audio",
+        "possible_values": [
+          [ "audio", "Audio" ],
+          [ "display-resample", "Display" ]
+        ]
+      },
+      {
+        "value": "audio_delay.normal",
+        "default": 0,
+        "hidden": true,
+        "possible_range": {
+          "min": -300,
+          "max": 300,
+          "step": 50
+        }
+      },
+      {
+        "value": "audio_delay.24hz",
+        "default": 0,
+        "hidden": true,
+        "possible_range": {
+          "min": -300,
+          "max": 300,
+          "step": 50
+        }
+      },
+      {
+        "value": "cache",
+        "default": 75,
+        "possible_values": [
+          [ 10, "Tiny (10 MB)" ],
+          [ 75, "Default (75 MB)" ],
+          [ 150, "Large (150 MB)", { "platforms_excluded": "oe_rpi" } ],
+          [ 500, "Very Large (500 MB)", { "platforms_excluded": "oe_rpi" } ]
+        ]
+      }
+    ]
+  },
+  {
+    "section": "subtitles",
+    "values": [
+      {
+        "value": "placement",
+        "default": "center,bottom",
+        "possible_values": [
+          [ "left,bottom", "Lower left" ],
+          [ "right,bottom", "Lower right" ],
+          [ "center,bottom", "Lower middle" ],
+          [ "left,top", "Upper left" ],
+          [ "right,top", "Upper right" ],
+          [ "center,top", "Upper middle" ]
+        ]
+      },
+      {
+        "value": "color",
+        "default": "#EEEEEE,#000000",
+        "possible_values": [
+          [ "#EEEEEE,#000000", "Light grey" ],
+          [ "#CCCCCC,#000000", "Blended light grey" ],
+          [ "#FBF93E,#000000", "Yellow" ],
+          [ "#FFFFCC,#000000", "Light yellow" ],
+          [ "#EEEDB8,#000000", "Blended light yellow" ]
+        ]
+      },
+      {
+        "value": "size",
+        "default": 32,
+        "possible_values": [
+          [ 18, "Tiny" ],
+          [ 24, "Small" ],
+          [ 32, "Normal" ],
+          [ 42, "Large" ],
+          [ 60, "Huge" ]
+        ]
+      }
+    ]
+  },
+  {
+    "section": "path",
+    "hidden": true,
+    "values": [
+      {
+        "value": "startupurl",
+        "default": "qrc:/konvergo/index.html"
+      },
+      {
+        "value": "helperprogram",
+        "default": ""
+      }
+    ]
+  },
+  {
+    "section": "cec",
+    "hidden": true,
+    "values": [
+      {
+        "value": "hdmiport",
+        "default": 0
+      },
+      {
+        "value": "verbose_logging",
+        "default": false
+      },
+      {
+        "value": "enable",
+        "default": true
+      }
+    ]
+  },
+  {
+    "section": "webclient",
+    "hidden": true,
+    "storage": true,
+    "values": []
+  },
+  {
+    "section": "openelec",
+    "hidden": true,
+    "values": [
+        {
+          "value": "systemname",
+          "default": "PlexMediaPlayer"
+        }
+    ]
+  }
+]
diff --git a/resources/sounds/Back.wav b/resources/sounds/Back.wav
new file mode 100644
index 0000000..eb1b193
Binary files /dev/null and b/resources/sounds/Back.wav differ
diff --git a/resources/sounds/Click.wav b/resources/sounds/Click.wav
new file mode 100644
index 0000000..13ac3a8
Binary files /dev/null and b/resources/sounds/Click.wav differ
diff --git a/resources/sounds/Cursor.wav b/resources/sounds/Cursor.wav
new file mode 100644
index 0000000..eb1b193
Binary files /dev/null and b/resources/sounds/Cursor.wav differ
diff --git a/resources/sounds/Notify.wav b/resources/sounds/Notify.wav
new file mode 100644
index 0000000..b8670b0
Binary files /dev/null and b/resources/sounds/Notify.wav differ
diff --git a/resources/sounds/Out.wav b/resources/sounds/Out.wav
new file mode 100644
index 0000000..af089a7
Binary files /dev/null and b/resources/sounds/Out.wav differ
diff --git a/resources/sounds/Shutter.wav b/resources/sounds/Shutter.wav
new file mode 100644
index 0000000..d5ac1e2
Binary files /dev/null and b/resources/sounds/Shutter.wav differ
diff --git a/scripts/WindowsSign.cmd b/scripts/WindowsSign.cmd
new file mode 100644
index 0000000..5f64f8f
--- /dev/null
+++ b/scripts/WindowsSign.cmd
@@ -0,0 +1,29 @@
+@echo off
+
+rem
+rem Usage - Sign.cmd <target file>
+rem
+
+setlocal
+
+set TargetFile=%~1
+if not exist "%SigningCert%" (
+  set SigningCert=%~dp0PlexTestSPC.pfx
+)
+
+set PasswordArg=
+if "%SigningCertPassword%" NEQ "" (
+  set PasswordArg=/p %SigningCertPassword%
+)
+
+signtool.exe sign /f "%SigningCert%" %PasswordArg% /t http://timestamp.verisign.com/scripts/timstamp.dll "%TargetFile%"
+if "%errorlevel%" == 1 (
+  echo FATAL ERROR - could sign %TargetFile%
+)
+
+signtool.exe verify /pa "%TargetFile%"
+if "%errorlevel%" == 1 (
+  echo FATAL ERROR - could not verify signature for %TargetFile%
+)
+
+endlocal
\ No newline at end of file
diff --git a/scripts/build-konvergo-qt.sh b/scripts/build-konvergo-qt.sh
new file mode 100644
index 0000000..1e832ea
--- /dev/null
+++ b/scripts/build-konvergo-qt.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+./configure \
+  -prefix $HOME/Qt/Qt5.6.0-alpha-konvergo \
+  -opensource \
+  -confirm-license \
+  -nomake tests \
+  -nomake examples \
+  -optimized-qmake \
+  -opengl desktop \
+  -no-feature-bearermanagement \
+  -no-gif \
+  -qt-libpng \
+  -qt-libjpeg \
+  -no-openssl \
+  -securetransport \
+  -qt-pcre \
+  -no-glib \
+  -no-cups \
+  -pch \
+  -no-eglfs \
+  -framework \
+  -release \
+  -force-debug-info \
+  -no-dbus \
+  -skip qtconnectivity \
+  -skip qtdoc \
+  -skip qtgraphicaleffects \
+  -skip qtmultimedia \
+  -skip qtsensors \
+  -skip qtserialport \
+  -skip qt3d
diff --git a/scripts/build-qt-resources.py b/scripts/build-qt-resources.py
new file mode 100755
index 0000000..94016bc
--- /dev/null
+++ b/scripts/build-qt-resources.py
@@ -0,0 +1,57 @@
+#!/usr/bin/python -u
+#
+# This creates a Qt resources XML file.
+#
+# Usage:
+#
+#  build-qt-resources.py output.qrc virtualpath1=realpath1 virtualpath2=realpath2 ... virtualpathN=realpathN
+#
+# "output.qrc" will be overwritten! Each argument after the output file
+# consists of a virtual path, which defines the resource prefix, and a real
+# path (i.e. an actual file system path), which sets the source file or
+# directory. If the real path is a file, the virtual path sets the full
+# virtual file name. If the real path is a directory, the directory is
+# scanned recursively, and all files are added, using the virtual path as
+# prefix.
+
+import sys
+import os
+import stat
+import io
+
+if len(sys.argv) < 2:
+  sys.exit(1)
+
+result = "<RCC>\n"
+
+def add_files(virtualpath, filepath):
+  global result
+
+  fstat = os.stat(filepath)
+  if stat.S_ISDIR(fstat.st_mode):
+    for item in os.listdir(filepath):
+      add_files(os.path.join(virtualpath, item), os.path.join(filepath, item))
+  else:
+    dirname, fname = os.path.split(virtualpath)
+    result += (('<qresource prefix=\"%s\">\n' +
+                ' <file alias=\"%s\">%s</file>\n' +
+                '</qresource>\n') % (dirname, fname, filepath))
+
+for item in sys.argv[2:]:
+  virtualpath, filepath = item.split("=", 1)
+  add_files(virtualpath, filepath)
+
+result += "</RCC>"
+
+result = result.encode("utf8")
+
+try:
+  with open(sys.argv[1], "rb") as infile:
+    if infile.read() == result:
+      # They're the same -> prevent cmake from rebuilding resources.
+      sys.exit(0)
+except IOError:
+  pass
+
+outfile = open(sys.argv[1], "wb")
+outfile.write(result)
diff --git a/scripts/build-windows.bat b/scripts/build-windows.bat
new file mode 100644
index 0000000..684b839
--- /dev/null
+++ b/scripts/build-windows.bat
@@ -0,0 +1,41 @@
+REM This script assumes the environment is already setup. For example:
+REM
+REM set PATH=C:\Python27;C:\Tools;C:\msys32\mingw32\bin;c:\msys32\usr\bin;C:\MinGW\msys\1.0\bin\;c:\windows\system32
+REM set CMAKE_DIR="c:\Program Files (x86)\CMake 3.2.3\bin"
+REM set QTROOT=c:\qt\qt5\build
+REM set EXTRADEPS=c:\whateveryouhave (see below)
+REM call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\vsvars32.bat"
+REM set BUILD_DIR=build
+REM (BUILD_DIR should be the name of the working dir - it must be a direct child directory of the repo dir)
+
+REM EXTRADEPS directory contents:
+REM - download libsdl.org/release/SDL2-devel-2.0.3-VC.zip
+REM - copy the include dir contents to EXTRADEPS/include
+REM - copy lib/x64/SDL2.{dll,lib} to EXTRADEPS/lib
+
+scripts\fetch-binaries.py -p windows-mingw32-x86_64 -n latest -d plexmediaplayer-windows-dependencies --nochecksha  || exit /b
+scripts\fetch-binaries.py -p msvc-windows-i386 -n latest -d plexmediaplayer-dependencies-msvc --nochecksha  || exit /b
+
+REM put all dependencies into a single dir
+rmdir /S /Q dependencies\all-deps
+mkdir dependencies\all-deps  || exit /b
+robocopy dependencies\konvergo-depends-windows-mingw32-x86_64-release dependencies\all-deps * /e
+robocopy dependencies\konvergo-depends-msvc-windows-i386-release dependencies\all-deps *  /e
+robocopy %EXTRADEPS% dependencies\all-deps *  /e
+set DEPS=%cd%\dependencies\all-deps
+
+LIB /def:%DEPS%\bin\mpv-1.def /out:%DEPS%\lib\mpv.lib /MACHINE:X64  || exit /b
+
+cd %BUILD_DIR%  || exit /b
+
+%CMAKE_DIR%\cmake -DQTROOT=%QTROOT% -DCMAKE_INSTALL_PREFIX=output -DDEPENDENCY_ROOT=%DEPS% -DBREAKPAD_LIBRARY=%DEPS%\lib\breakpad.lib -DMPV_INCLUDE_DIR=%DEPS%\include -DMPV_LIBRARY=%DEPS%\lib\mpv.lib -DSDL2_LIBRARY=%DEPS%\lib\sdl2.lib -DSDL2_INCLUDE_DIR=%DEPS%\include -DCEC_LIBRARY=%DEPS%\lib\libcec.lib -DCEC_INCLUDE_DIR=%DEPS%\include .. -G "Visual Studio 12 2013 Win64" -DENABLE_DUMP_SYMBOLS=off -DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo  -DCODE_SIGN=ON || exit /b
+
+msbuild PlexMediaPlayer.sln /p:configuration=RelWithDebInfo  || exit /b
+
+mkdir output
+
+%CMAKE_DIR%\cmake  -P cmake_install.cmake || exit /b
+
+%CMAKE_DIR%\cpack   || exit /b
+
+..\scripts\WindowsSign.cmd PlexMediaPlayer-*.exe
diff --git a/scripts/dump-syms.sh b/scripts/dump-syms.sh
new file mode 100755
index 0000000..07784cc
--- /dev/null
+++ b/scripts/dump-syms.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+DUMP_SYMS=$1
+COMPRESS=$2
+SOURCE=$3
+TARGET=$4
+
+echo $SOURCE
+
+DSYM_ARG=""
+DSYM_FILE=""
+BASESOURCE=$(basename "$SOURCE")
+if [ -e "$BASESOURCE.dSYM" ]; then
+  DSYM_ARG="-g"
+  DSYM_FILE="$BASESOURCE.dSYM"
+fi
+
+echo $DUMP_SYMS $DSYM_ARG $DSYM_FILE $SOURCE | $COMPRESS > $TARGET
+$DUMP_SYMS $DSYM_ARG "$DSYM_FILE" "$SOURCE" | $COMPRESS > "$TARGET"
diff --git a/scripts/dump_qt_symbols_osx.sh b/scripts/dump_qt_symbols_osx.sh
new file mode 100755
index 0000000..a64ca2b
--- /dev/null
+++ b/scripts/dump_qt_symbols_osx.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+set -e
+
+rm -rf symbols
+mkdir symbols
+
+dylibs=$(find lib plugins -type f -name *.dylib)
+frameworks=$(find lib -type d -name *.framework)
+
+echo "Dumping symbols for dylibs..."
+for lib in $dylibs; do
+  libname=$(basename $lib)
+  echo $libname
+  dsymutil -o symbols/$libname.dSYM $lib &>/dev/null
+  ~/dump_syms -g symbols/$libname.dSYM $lib 2> /dev/null | xz -9 -e - 1> symbols/$libname.symbols.xz
+done
+
+for f in $frameworks; do
+  frameworkname=$(basename $f)
+  frameworkfname="${frameworkname%.*}"
+  ffname="$f/$frameworkfname"
+  if [ -e $ffname ]; then
+    echo $frameworkname
+    dsymutil -o symbols/$frameworkname.dSYM $ffname
+    ~/dump_syms -g symbols/$frameworkname.dSYM $ffname 2>/dev/null | xz -9 -e - > symbols/$frameworkname.symbols.xz
+  fi
+done
diff --git a/scripts/fetch-binaries.py b/scripts/fetch-binaries.py
new file mode 100755
index 0000000..6937d87
--- /dev/null
+++ b/scripts/fetch-binaries.py
@@ -0,0 +1,278 @@
+#!/usr/bin/env python
+# Sample CI usage: scripts\common\fetch-binaries.py -p windows -b release -t abc123 -n 33
+# Sample desktop usage: scripts\common\fetch-binaries.py -i ..\plex-dependency-builder\output\Packages\pms-depends-windows-i386-debug-dev.bz2
+
+import hashlib
+import optparse
+import ConfigParser
+import os, re
+import platform
+import subprocess
+import sys
+import shutil
+import urllib2
+import base64
+import glob
+
+# Edit these to set a new default dependencies build
+default_tag = "auto"
+default_release_build_number = "96"
+default_release_dir = "plexmediaplayer-dependencies"
+default_branch = "master"
+
+def sha1_for_file(path):
+    hash=hashlib.sha1()
+    fp=file(path, "rb")
+    while True:
+        data=fp.read(4096)
+        if not data:
+            break
+        hash.update(data)
+    return hash.hexdigest()
+
+def exec_cmd(args, env={}, supress_output=False):
+    """ main exec_cmd function """
+
+    # forward SSH_AUTH_SOCK, so that ssh-agent works
+    if os.name != "nt" and "SSH_AUTH_SOCK" in os.environ:
+        env = os.environ
+        extra_env={"SSH_AUTH_SOCK":os.environ["SSH_AUTH_SOCK"]}
+        env.update(extra_env)
+    else:
+        env = os.environ
+
+    cmd = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.STDOUT, env = env)
+    output = ''
+    while True:
+        out = cmd.stdout.read(1)
+        if out == '' and cmd.poll() != None:
+            break
+        if out != '':
+            if not supress_output:
+                sys.stdout.write(out)
+            output += out
+    if cmd.wait() != 0:
+        raise Exception("Command failed: \"%s\"" % " ".join(args), output)
+    return output
+
+
+platform_map={"linux-synology-i386":"synology-i686",
+              "linux-readynas-arm":"ubuntu-arm",
+              "linux-debian-4-i386":"debian-i686",
+              "linux-control4-arm":"control4-arm",
+              "linux-apm-ppc":"apm-ppc",
+              "linux-armada-arm7":"armada-arm7",
+              "linux-synology-arm":"synology-arm"}
+
+def platform_str():
+    if "BUILD_TAG" in os.environ:
+        for (k, v) in platform_map.iteritems():
+            if k in os.environ["BUILD_TAG"]:
+                return "linux-"+v
+
+    return "linux-%s-%s"%(platform.linux_distribution()[0].strip().lower(), platform.machine())
+
+def merge_directories(src, dest, move = False):
+    for src_dir, dirs, files in os.walk(src):
+        dst_dir = src_dir.replace(src, dest)
+        if not os.path.exists(dst_dir):
+            os.mkdir(dst_dir)
+        for file_ in files:
+            src_file = os.path.join(src_dir, file_)
+            dst_file = os.path.join(dst_dir, file_)
+            if os.path.exists(dst_file):
+                os.remove(dst_file)
+            if move:
+                shutil.move(src_file, dst_dir)
+            else:
+                shutil.copy(src_file, dst_dir)
+    if move and os.path.exists(src):
+        shutil.rmtree(src)
+
+def unpack_and_install(download, inputfile, installed_filepath):
+    # Make paths absolute before changing directories
+    inputfile = os.path.abspath(inputfile)
+    if not os.path.exists(inputfile):
+        print "Input file %s does not exist" % inputfile
+        sys.exit(1)
+    shafile = "%s.sha.txt" % inputfile
+
+    installed_filepath = os.path.abspath(installed_filepath)
+
+    # Go to directory.
+    old_cwd = os.getcwd()
+    os.chdir(options.output)
+
+    # Check the SHA
+    if options.nochecksha:
+        print "-- Skipping SHA verification"
+    elif os.path.exists(shafile):
+        f = open(shafile, "r")
+        sha = f.readline().strip()
+        computed = sha1_for_file(inputfile)
+        if not computed == sha:
+            print "-- SHA didn't match: %s != %s" % (sha, computed)
+            sys.exit(1)
+        else:
+            print "-- SHA %s matches" % sha
+
+        f.close()
+    else:
+        print "-- ERROR - No SHA file is available to verify the file's integrity"
+        sys.exit(1)
+
+    # Untar the package file
+    inputfile_tarfriendly = inputfile
+    if os.name == "nt":
+        pattern = re.compile(r'([a-z]):\\', re.IGNORECASE)
+        inputfile_tarfriendly = pattern.sub('/\\1/', inputfile).replace('\\','/')
+
+    # The final destination directory is the filename without a version number
+    # The version number is the last element in the filename (by convention)
+    packagename = os.path.splitext(os.path.basename(inputfile))[0]
+    packagename_elements = packagename.split("-")
+    del packagename_elements[-1]
+    packagename_noversion = "-".join(packagename_elements)
+
+    if os.path.exists(packagename_noversion):
+        shutil.rmtree(packagename_noversion, ignore_errors=True)
+
+    os.makedirs(packagename_noversion)
+
+    print "-- Unpacking %s... to %s" % (os.path.basename(inputfile), packagename_noversion)
+    if os.name == "nt":
+        # Touch files from the package, which often arrive from the future when freshly built on our Windows build machine
+        exec_cmd(["tar", "xjf", inputfile_tarfriendly, "-C", packagename_noversion, "--touch", "--strip-components", "1", "--no-same-owner"])
+    else:
+        exec_cmd(["tar", "xjf", inputfile_tarfriendly, "-C", packagename_noversion, "--strip-components", "1", "--no-same-owner"])
+
+    if download and installed_filepath:
+        # Create the installed stamp file to note our success
+        open(installed_filepath, "wb")
+    
+    # Restore directory.
+    os.chdir(old_cwd)
+        
+    return packagename
+
+if __name__=='__main__':
+    parser=optparse.OptionParser()
+
+    parser.add_option("-p", "--platform", action="store", type="string",
+        dest="platform", help="Platform identifier (e.g. windows-i386)", default=None)
+
+    parser.add_option("-b", "--buildconfig", action="store", type="string",
+        dest="buildconfig", help="Build configuration (release or debug). Default is release", default="release")
+
+    parser.add_option("-t", "--tag", action="store", type="string",
+        dest="tag", help="Build tag. Default is %s" % default_tag, default=default_tag)
+
+    parser.add_option("-n", "--buildnumber", action="store", type="string",
+        dest="buildnumber", help="Build number. Default is %s for release builds" % (default_release_build_number), default=None)
+
+    parser.add_option("-d", "--dir", action="store", type="string",
+        dest="dir", help="CI build dir. Default is %s for release builds" % (default_release_dir), default=None)
+
+    parser.add_option("-i", "--inputfile", action="store", type="string",
+        dest="inputfile", help="Dependencies package filename, can be supplied instead of platform, buildconfig, tag and buildnumber", default=None)
+
+    parser.add_option("-o", "--output", action="store", type="string",
+        dest="output", help="Output directory. Default is Dependencies",
+        default="Dependencies")
+
+    parser.add_option("-x", "--nochecksha", action="store_true",
+        dest="nochecksha", help="Don't check the SHA. Default is false",
+        default=False)
+
+    parser.add_option("-r", "--branch", action="store", type="string",
+            dest="branch", help="Git branch", default=None)
+
+    (options, args)=parser.parse_args(sys.argv)
+
+    if not os.path.exists(options.output):
+        os.makedirs(options.output)
+
+    # Fail early if platform is not known
+    download = not options.inputfile
+    if download and not options.platform:
+        print "ERROR - A platform must be specified"
+        sys.exit(1)
+
+    installed_filepath = None
+    if download:
+
+        if not options.buildnumber:
+            if options.buildconfig == "release":
+                options.buildnumber = default_release_build_number
+            else:
+                options.buildnumber = default_debug_build_number
+
+        if not options.dir:
+            if options.buildconfig == "release":
+                options.dir = default_release_dir
+            else:
+                options.dir = default_debug_dir
+
+        installed_filepath = os.path.join(options.output, "konvergo-depends-%s-%s-%s.installed" % (options.platform, options.buildconfig, options.buildnumber))
+        if os.path.exists(installed_filepath) and options.buildnumber != "latest":
+            print "The required deps bundle was already downloaded and installed."
+            print "You can delete %s to force a reinstall." % installed_filepath
+            sys.exit(0)
+
+        # Delete previous installed stamps
+        cont = ["-c"]
+        for path in glob.iglob(os.path.join(options.output, "konvergo-depends-%s-%s-*.installed") % (options.platform, options.buildconfig)):
+            match = re.search("-(\d+)\.installed", path, re.DOTALL)
+            if match:
+                if not match.group(1) == options.buildnumber:
+                    cont = []
+            os.remove(path)
+
+        if options.tag == "auto":
+            req = urllib2.Request("https://nightlies.plex.tv/directdl/plex-dependencies/%s/%s/hash.txt" % (options.dir, options.buildnumber))
+            try:
+                match = urllib2.urlopen(req).read().rstrip()
+            except urllib2.URLError, err:
+                print err
+                print "ERROR - Download failed"
+                sys.exit(1)
+
+            options.tag = match
+
+        base_filename = "konvergo-depends-%s-%s-%s" % (options.platform, options.buildconfig, options.tag)
+        filename = "%s.tbz2" % base_filename
+
+        installed_filepath = os.path.join(options.output, "konvergo-depends-%s-%s-%s.installed" % (options.platform, options.buildconfig, options.buildnumber))
+        if os.path.exists(installed_filepath):
+            print "%s was already downloaded and installed." % filename
+            print "You can delete %s to force a reinstall." % installed_filepath
+            sys.exit(0)
+
+        url = "https://nightlies.plex.tv/directdl/plex-dependencies/%s/%s/%s" % (options.dir, options.buildnumber, filename)
+        inputfile = os.path.join(options.output, filename)
+
+        print "-- Downloading %s ..." % url
+        exec_cmd(["wget", "--no-check-certificate"] + cont + ["-O", inputfile, url])
+
+        shaurl = "%s.sha.txt" % url
+        shafile = "%s.sha.txt" % inputfile
+
+        print "-- Downloading %s ..." % shaurl
+        exec_cmd(["wget", "--no-check-certificate"] + ["-O", shafile, shaurl])
+
+    else:
+        inputfile = options.inputfile
+
+    # Unpack and install
+    packagename = unpack_and_install(download, inputfile, installed_filepath)
+
+    # On OS X, we need to postprocess the dependencies.
+    if platform.system() == 'Darwin':
+        root = os.path.realpath(os.path.join(os.getcwd()))
+        script = os.path.join(root, "scripts", "fix-install-names.py")
+        for p in ("lib", "bin", "update_installer"):
+            path = os.path.join(root, "Dependencies", "konvergo-depends-" + options.platform + "-" + options.buildconfig, p)
+            exec_cmd([script, path])
+
+    # Done!
+    print "-- Done with %s" % packagename
diff --git a/scripts/fix-install-names.py b/scripts/fix-install-names.py
new file mode 100755
index 0000000..c63665f
--- /dev/null
+++ b/scripts/fix-install-names.py
@@ -0,0 +1,74 @@
+#!/usr/bin/python
+
+import hashlib
+import optparse
+import ConfigParser
+import os
+import platform
+import subprocess
+import sys
+import shutil
+
+def exec_cmd(args, env={}, supress_output=False):
+    cmd = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.STDOUT, env = env)
+    output = ''
+    while True:
+      out = cmd.stdout.read(1)
+      if out == '' and cmd.poll() != None:
+        break
+      if out != '':
+        if not supress_output:
+          sys.stdout.write(out)
+        output += out
+    if cmd.wait() != 0:
+      raise Exception("Command failed: \"%s\"" % " ".join(args), output)
+    return output
+
+def fix_install_name(path):
+  for root, dirs, files in os.walk(path):
+    for f in files:
+      fpath = os.path.join(root, f)
+      if (f.endswith(".dylib") or f in ['fc-cache'] or f.endswith(".so")) and not os.path.islink(fpath) and os.path.exists(fpath):
+
+        # Fix permissions
+        if not os.access(fpath, os.W_OK) or not os.access(fpath, os.R_OK) or not os.access(fpath, os.X_OK):
+          os.chmod(fpath, 0o644)
+
+        try:
+          basename = os.path.basename(fpath)
+          otoolout = exec_cmd(["otool", "-L", fpath], supress_output=True)
+
+          for l in otoolout.split("\n")[1:]:
+            l = l.rstrip().strip()
+
+            # See if we need to fix it up.
+            if len(l) > 0 and (l.startswith("/Users/admin/") or l[0] != '/'):
+              current_lib = l.split(" (compat")[0]
+              current_basename = os.path.basename(current_lib)
+              correct_lib = os.path.join(root, current_basename)
+
+              if not os.path.exists(correct_lib):
+                # look for it further up, like in the root path:
+                if os.path.exists(os.path.join(path, "lib", current_basename)):
+                  correct_lib = os.path.join(path, "lib", current_basename)
+                else:
+                  print "Can't link %s" % current_lib
+                  continue
+
+              # print current_lib, correct_lib
+              if current_lib != correct_lib:
+                if current_basename.split('.')[0] == basename.split('.')[0]:
+                  print "-- Fixing ID for", basename
+                  exec_cmd(["install_name_tool", "-id", correct_lib, fpath], supress_output=True)
+                else:
+                  print "-- Fixing library link for %s (%s)" % (basename, current_basename)
+                  exec_cmd(["install_name_tool", "-change", current_lib, correct_lib, fpath], supress_output=True)
+
+        except:
+          print "** Fail when running installname on %s" % f
+          raise
+          continue
+
+if __name__=='__main__':
+  if os.path.isdir(sys.argv[1]):
+    fix_install_name(sys.argv[1])
diff --git a/scripts/install-dylibs.py b/scripts/install-dylibs.py
new file mode 100755
index 0000000..577f62e
--- /dev/null
+++ b/scripts/install-dylibs.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python
+import subprocess, os, sys, shutil, Queue, fnmatch
+
+def exec_cmd(args, env={}, supress_output=False):
+    cmd = subprocess.Popen(args, stdout = subprocess.PIPE, stderr = subprocess.STDOUT, env = env)
+    output = ''
+    while True:
+      out = cmd.stdout.read(1)
+      if out == '' and cmd.poll() != None:
+        break
+      if out != '':
+        if not supress_output:
+          sys.stdout.write(out)
+        output += out
+    if cmd.wait() != 0:
+      raise Exception("Command failed: \"%s\"" % " ".join(args), output)
+    return output
+
+binaries = {}
+
+def install_libraries(binary):
+  if binaries.has_key(binary): return []
+  binaries[binary] = True
+  other_binaries = []
+
+  out = exec_cmd(["otool", "-L", binary], supress_output=True)
+  for line in out.split('\n'):
+    line = line.strip()
+    if line.find("dylib") != -1 and (line.startswith('@executable_path') or line.find("libQt5") != -1):
+      file = line.split('/')[-1].split(' ')[0]
+      if line.startswith("@executable_path"):
+        src = os.path.join(sys.argv[1], "dependencies/darwin-x86_64/lib", file)
+      else:
+        src = line.split(" (")[0]
+
+      dst = os.path.join(sys.argv[2], "Konvergo.app", "Contents", "Frameworks", file)
+      if os.path.exists(src):
+        if (not os.path.exists(dst) or os.path.getsize(dst) != os.path.getsize(src)):
+          print "-- Installing %s" % file
+          shutil.copyfile(src, dst)
+
+        other_binaries.append(src)
+
+  return other_binaries
+
+queue = Queue.Queue()
+
+# Add the top-level binaries.
+for b in ['Contents/MacOS/Konvergo']:
+  queue.put(os.path.join(sys.argv[2], "Konvergo.app", b))
+
+for root, dirs, files in os.walk(os.path.join(sys.argv[2], "Konvergo.app", "Contents", "Frameworks", "vlc")):
+  for f in files:
+    path = os.path.join(root, f)
+    queue.put(path)
+
+while queue.empty() == False:
+  binary = queue.get()
+  other_binaries = install_libraries(binary)
+  for b in other_binaries:
+    queue.put(b)
\ No newline at end of file
diff --git a/src/.clang-format b/src/.clang-format
new file mode 100644
index 0000000..236ef64
--- /dev/null
+++ b/src/.clang-format
@@ -0,0 +1,47 @@
+---
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+ConstructorInitializerIndentWidth: 2
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: false
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+BinPackParameters: true
+ColumnLimit:     100
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+DerivePointerBinding: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 60
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 1000
+PointerBindsToType: true
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: false
+Standard:        Cpp03
+IndentWidth:     2
+TabWidth:        2
+UseTab:          Never
+BreakBeforeBraces: Allman
+IndentFunctionDeclarationAfterType: false
+SpacesInParentheses: false
+SpacesInAngles:  false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpaceAfterControlStatementKeyword: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 0
+...
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..01fd841
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,168 @@
+include_directories(
+  ${CMAKE_SOURCE_DIR}/external/qhttpserver/src
+  ${CMAKE_SOURCE_DIR}/external/qslog
+  ${CMAKE_SOURCE_DIR}/external/SPMediaKeyTap
+  ${CMAKE_SOURCE_DIR}/external/plistparser
+  ${CMAKE_SOURCE_DIR}/src/player
+  shared
+)
+
+set(CMAKE_AUTOMOC ON)
+
+add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
+
+find_package(Breakpad)
+
+if(BREAKPAD_FOUND)
+  include_directories(${BREAKPAD_INCLUDE_DIR})
+  set(BREAKPAD_LIBRARIES ${BREAKPAD_LIBRARY})
+  if(UNIX)
+    # cmake issue: breakpad-client.pc adds this, but cmake discards it
+    set(BREAKPAD_LIBRARIES ${BREAKPAD_LIBRARIES} -lpthread)
+  endif()
+endif()
+
+add_subdirectory(shared)
+add_subdirectory(display)
+add_subdirectory(player)
+add_subdirectory(utils)
+add_subdirectory(server)
+add_subdirectory(ui)
+add_subdirectory(input)
+add_subdirectory(system)
+add_subdirectory(breakpad)
+add_subdirectory(settings)
+add_subdirectory(power)
+add_subdirectory(remote)
+add_subdirectory(tools)
+
+get_property(ALL_SRCS GLOBAL PROPERTY SRCS_LIST)
+set(MAIN_SRCS
+  Version.h
+  ComponentManager.cpp
+  ComponentManager.h
+  main.cpp
+)
+
+# add unix signal management classes
+if (UNIX)
+  set(MAIN_SRCS ${MAIN_SRCS}
+    SignalManager.h
+    SignalManager.cpp
+  )
+endif()
+
+source_group("Source Files" FILES ${MAIN_SRCS})
+set(SOURCES ${MAIN_SRCS} ${ALL_SRCS})
+
+# Set some Objective-C flags.
+# We need to force the Language to C instead of C++
+# and also make sure that we use ARC
+#
+foreach(S ${SOURCES})
+  string(REGEX MATCH ".*\\.m$" MATCH_OBJC ${S})
+  if(MATCH_OBJC)
+    set_property(SOURCE ${S} PROPERTY COMPILE_FLAGS "-fobjc-arc")
+    set_property(SOURCE ${S} PROPERTY LANGUAGE C)
+  endif()
+endforeach(S SOURCE)
+
+foreach(sfile in ${ALL_SRCS})
+  get_filename_component(REALNAME ${sfile} REALPATH)
+  get_filename_component(DIRNAME ${REALNAME} DIRECTORY)
+  string(REPLACE "${CMAKE_SOURCE_DIR}/src/" "" SUBDIR ${DIRNAME})
+  string(TOLOWER ${SUBDIR} SUBDIR)
+  string(REPLACE "/" "\\\\" GNAME ${SUBDIR})
+  source_group("Source Files\\\\${GNAME}" FILES ${sfile})
+endforeach(sfile in ${ALL_SRCS})
+
+find_package(PythonInterp REQUIRED)
+file(GLOB_RECURSE RESOURCE_FILES ${CMAKE_SOURCE_DIR}/resources/*)
+
+# generate resources.qrc from directory tree listings
+add_custom_command(OUTPUT resources.qrc
+  COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/scripts/build-qt-resources.py
+          ${CMAKE_CURRENT_BINARY_DIR}/resources.qrc
+          /=${CMAKE_SOURCE_DIR}/resources/
+          ui/webview.qml=${CMAKE_SOURCE_DIR}/src/ui/webview.qml
+          ui/errormessage.qml=${CMAKE_SOURCE_DIR}/src/ui/errormessage.qml
+  COMMENT "Creating resources.qrc"
+  DEPENDS ${CMAKE_SOURCE_DIR}/scripts/build-qt-resources.py
+    ${RESOURCE_FILES}
+    ${CMAKE_SOURCE_DIR}/src/ui/webview.qml
+    ${CMAKE_SOURCE_DIR}/src/ui/errormessage.qml
+)
+set_source_files_properties(resources.qrc PROPERTIES GENERATED TRUE)
+add_custom_command(OUTPUT qrc_resources.cpp
+  COMMAND ${Qt5Core_RCC_EXECUTABLE} -name resources -o qrc_resources.cpp resources.qrc
+  DEPENDS resources.qrc ${CMAKE_SOURCE_DIR}/src/ui/webview.qml ${RESOURCE_FILES}
+)
+set_source_files_properties(qrc_resources.cpp PROPERTIES GENERATED TRUE)
+
+# handle Web-Client resource
+include(WebClientResources)
+
+set_source_files_properties(${PROJECT_SOURCE_DIR}/bundle/osx/Plex.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+list(APPEND RESOURCE_FILES qrc_resources.cpp ${WEB_CLIENT_CPP})
+
+if(APPLE)
+  list(APPEND RESOURCE_FILES ${PROJECT_SOURCE_DIR}/bundle/osx/Plex.icns)
+  if(HAVE_UPDATER)
+    list(APPEND RESOURCE_FILES ${UPDATER_PATH})
+    set_source_files_properties(${UPDATER_PATH} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+  endif(HAVE_UPDATER)
+
+  set(PLISTPARSER plistparser)
+endif()
+
+set(MACOSX_BUNDLE_ICON_FILE Plex.icns)
+set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${VERSION_STRING})
+set(MACOSX_BUNDLE_BUNDLE_NAME "Plex Media Player")
+set(MACOSX_BUNDLE_BUNDLE_VERSION ${VERSION_STRING})
+set(MACOSX_BUNDLE_GUI_IDENTIFIER tv.plex.player)
+
+if(WIN32)
+  list(APPEND RESOURCE_FILES ${CMAKE_SOURCE_DIR}/bundle/win/iconres.rc)
+  install(PROGRAMS ${CMAKE_BINARY_DIR}/updater.exe DESTINATION ${INSTALL_BIN_DIR})
+endif()
+
+get_property(BUNDLED_FILES GLOBAL PROPERTY CONFIG_BUNDLED_FILES)
+add_executable(${MAIN_TARGET} WIN32 MACOSX_BUNDLE ${SOURCES} ${BUNDLED_FILES} ${RESOURCE_FILES})
+
+set_target_properties(${MAIN_TARGET} PROPERTIES
+  MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/bundle/osx/Info.plist.in
+  INSTALL_RPATH "${QTROOT}/lib"
+  OUTPUT_NAME ${MAIN_NAME}
+  CXX_STANDARD 11
+  CXX_STANDARD_REQUIRED TRUE
+)
+
+target_link_libraries(${MAIN_TARGET}
+  shared
+  qhttpserver
+  qslog
+  ${PLISTPARSER}
+  ${MPV_LIBRARY}
+  ${OPENGL_LIBS}
+  ${QT5_LIBRARIES}
+  ${OS_LIBS}
+  ${EXTRA_LIBS}
+  ${X11_LIBRARIES}
+  ${X11_Xrandr_LIB}
+  ${BREAKPAD_LIBRARIES}
+  ${ICU_LIBRARIES}
+  ${CMAKE_THREAD_LIBS_INIT}
+  ${RPI_LIBS}
+)
+
+install(TARGETS ${MAIN_TARGET} DESTINATION ${INSTALL_BIN_DIR})
+
+set(EXE "${MAIN_NAME}.app")
+set(LIBPATH ${CMAKE_FIND_ROOT_PATH})
+set(SOURCE_ROOT ${CMAKE_SOURCE_DIR})
+
+if(ENABLE_DUMP_SYMBOLS)
+  dumpsyms(${MAIN_TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${MAIN_TARGET}.symbols)
+endif()
+
+include(CompleteBundle)
diff --git a/src/ComponentManager.cpp b/src/ComponentManager.cpp
new file mode 100644
index 0000000..ea962e1
--- /dev/null
+++ b/src/ComponentManager.cpp
@@ -0,0 +1,86 @@
+#include <QObject>
+#include <QtQml>
+#include <qqmlwebchannel.h>
+
+#include "ComponentManager.h"
+
+#include "power/PowerComponent.h"
+#include "server/HTTPServer.h"
+#include "input/InputComponent.h"
+#include "player/PlayerComponent.h"
+#include "display/DisplayComponent.h"
+#include "system/SystemComponent.h"
+#include "system/UpdaterComponent.h"
+#include "settings/SettingsComponent.h"
+#include "remote/RemoteComponent.h"
+
+#if KONVERGO_OPENELEC
+#include "system/openelec/OESystemComponent.h"
+#endif
+
+#include "QsLog.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+ComponentManager::ComponentManager() : QObject(0)
+{
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void ComponentManager::registerComponent(ComponentBase* comp)
+{
+  if (m_components.contains(comp->componentName()))
+  {
+    QLOG_ERROR() << "Component" << comp->componentName() << "already registered!";
+    return;
+  }
+  
+  if (comp->componentInitialize())
+  {
+    QLOG_INFO() << "Component:" << comp->componentName() << "inited";
+    m_components[comp->componentName()] = comp;
+
+    // define component as property for qml
+    m_qmlProperyMap.insert(comp->componentName(), QVariant::fromValue(comp));
+  }
+  else
+  {
+    QLOG_ERROR() << "Failed to init component:" << comp->componentName();
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void ComponentManager::initialize()
+{
+  // then settings, since all other components
+  // might have some settings
+  //
+  registerComponent(&SettingsComponent::Get());
+
+  m_server = new HttpServer(this);
+  m_server->start();
+
+  registerComponent(&SystemComponent::Get());
+  registerComponent(&InputComponent::Get());
+  registerComponent(&DisplayComponent::Get());
+  registerComponent(&UpdaterComponent::Get());
+  registerComponent(&RemoteComponent::Get());
+  registerComponent(&PlayerComponent::Get());
+  registerComponent(&PowerComponent::Get());
+
+#if KONVERGO_OPENELEC
+  registerComponent(&OESystemComponent::Get());
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void ComponentManager::setWebChannel(QWebChannel* webChannel)
+{
+  foreach(ComponentBase* comp, m_components.values())
+  {
+    if (comp->componentExport())
+    {
+      QLOG_DEBUG() << "Adding component:" << comp->componentName() << "to webchannel";
+      webChannel->registerObject(comp->componentName(), comp);
+    }
+  }
+}
diff --git a/src/ComponentManager.h b/src/ComponentManager.h
new file mode 100644
index 0000000..91a1a60
--- /dev/null
+++ b/src/ComponentManager.h
@@ -0,0 +1,42 @@
+#ifndef __COMPONENT_MANAGER_H__
+#define __COMPONENT_MANAGER_H__
+
+#include <QObject>
+#include <QMap>
+#include <QQmlContext>
+#include <QQmlPropertyMap>
+#include <QWebChannel>
+
+#include "utils/Utils.h"
+#include "server/HTTPServer.h"
+
+class ComponentBase : public QObject
+{
+public:
+  ComponentBase(QObject* parent = 0) : QObject(parent) { }
+  
+  virtual bool componentInitialize() = 0;
+  virtual const char* componentName() = 0;
+  virtual bool componentExport() = 0;
+};
+
+class ComponentManager : public QObject
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(ComponentManager);
+public:
+  void initialize();
+  inline QQmlPropertyMap &getQmlPropertyMap() { return m_qmlProperyMap; }
+  void setWebChannel(QWebChannel* webChannel);
+
+private:
+  ComponentManager();
+  void registerComponent(ComponentBase* comp);
+
+  HttpServer* m_server;
+
+  QMap<QString, ComponentBase*> m_components;
+  QQmlPropertyMap m_qmlProperyMap;
+};
+
+#endif
diff --git a/src/KonvergoPCH.h b/src/KonvergoPCH.h
new file mode 100644
index 0000000..2f0e319
--- /dev/null
+++ b/src/KonvergoPCH.h
@@ -0,0 +1,9 @@
+
+#if defined(__cplusplus)
+#include <Qt>
+#include <QString>
+#include <QList>
+#include <QVariant>
+#include <QObject>
+#include <QWidget>
+#endif
diff --git a/src/SignalManager.cpp b/src/SignalManager.cpp
new file mode 100644
index 0000000..6c49686
--- /dev/null
+++ b/src/SignalManager.cpp
@@ -0,0 +1,86 @@
+#include "sys/socket.h"
+#include "unistd.h"
+#include "signal.h"
+
+#include "QsLog.h"
+#include "SignalManager.h"
+#include "settings/SettingsComponent.h"
+
+int SignalManager::sigtermFd[2];
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+SignalManager::SignalManager(QGuiApplication* app) : QObject(NULL), m_app(app)
+{
+  if (setupHandlers())
+  {
+    QLOG_ERROR() << "Failed to install SignalDaemon handlers.";
+  }
+
+  QLOG_DEBUG() << "Signal handlers installed successfully.";
+
+  if (socketpair(AF_UNIX, SOCK_STREAM, 0, SignalManager::sigtermFd))
+  {
+    QLOG_ERROR() << "Couldn't create TERM socketpair";
+  }
+
+  snTerm = new QSocketNotifier(SignalManager::sigtermFd[1], QSocketNotifier::Read, this);
+  connect(snTerm, SIGNAL(activated(int)), this, SLOT(handleSignal()));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int SignalManager::setupHandlers()
+{
+  struct sigaction term;
+
+  term.sa_handler = SignalManager::signalHandler;
+  sigemptyset(&term.sa_mask);
+  term.sa_flags = SA_RESTART | SA_RESETHAND;
+
+  if (sigaction(SIGHUP, &term, 0) < 0)
+    return -1;
+
+  if (sigaction(SIGTERM, &term, 0) < 0)
+    return -2;
+
+  term.sa_flags = SA_RESTART;
+  if (sigaction(SIGUSR1, &term, 0) < 0)
+    return -3;
+
+  return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SignalManager::signalHandler(int signal_num)
+{
+  unsigned char a = signal_num < 255 ? signal_num : 0;
+  write(sigtermFd[0], &a, sizeof(a));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SignalManager::handleSignal()
+{
+  snTerm->setEnabled(false);
+  unsigned char signal_number = 0;
+  read(sigtermFd[1], &signal_number, sizeof(signal_number));
+
+  // do Qt stuff
+  if (signal_number == SIGUSR1)
+  {
+    QLOG_DEBUG() << "Received SIGUSR1, reloading config file";
+    SettingsComponent::Get().load();
+  }
+  else
+  {
+    QLOG_DEBUG() << "Received signal, closing application";
+    closeApplication();
+  }
+
+  snTerm->setEnabled(true);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SignalManager::closeApplication()
+{
+  if (m_app)
+    m_app->quit();
+}
diff --git a/src/SignalManager.h b/src/SignalManager.h
new file mode 100644
index 0000000..da53530
--- /dev/null
+++ b/src/SignalManager.h
@@ -0,0 +1,33 @@
+#ifndef SIGNALMANAGER_H
+#define SIGNALMANAGER_H
+
+#include <QObject>
+#include <QSocketNotifier>
+#include <QGuiApplication>
+
+class SignalManager : public QObject
+{
+  Q_OBJECT
+
+public:
+  SignalManager(QGuiApplication* app);
+  ~SignalManager() {}
+
+  // Unix signal handlers.
+  static void signalHandler(int signal_num);
+
+  int setupHandlers();
+  void closeApplication();
+
+public slots:
+  // Qt signal handlers.
+  void handleSignal();
+
+private:
+  static int sigtermFd[2];
+
+  QSocketNotifier* snTerm;
+  QGuiApplication* m_app;
+};
+
+#endif // SIGNALMANAGER_H
diff --git a/src/Version.cpp.in b/src/Version.cpp.in
new file mode 100644
index 0000000..fd089b6
--- /dev/null
+++ b/src/Version.cpp.in
@@ -0,0 +1,24 @@
+// Autogenerated CPP file
+
+#include <QString>
+#include "Version.h"
+
+QString Version::GetVersionString()
+{
+  return QString("@VERSION_STRING@");
+}
+
+QString Version::GetCanonicalVersionString()
+{
+  return QString("@CANONICAL_VERSION_STRING@");
+}
+
+QString Version::GetBuildDate()
+{
+  return QString("@CURRENT_DATE@");
+}
+
+QString Version::GetWebVersion()
+{
+  return QString("@WEB_CLIENT_VERSION@");
+}
\ No newline at end of file
diff --git a/src/Version.h b/src/Version.h
new file mode 100644
index 0000000..9da17ff
--- /dev/null
+++ b/src/Version.h
@@ -0,0 +1,13 @@
+#ifndef VERSION_H
+#define VERSION_H
+
+namespace Version
+{
+  QString GetVersionString();
+  QString GetCanonicalVersionString();
+  QString GetBuildDate();
+  QString GetWebVersion();
+};
+
+#endif // VERSION_H
+
diff --git a/src/breakpad/BreakPad.h b/src/breakpad/BreakPad.h
new file mode 100644
index 0000000..ba73964
--- /dev/null
+++ b/src/breakpad/BreakPad.h
@@ -0,0 +1,8 @@
+#ifndef BREAKPAD_H
+#define BREAKPAD_H
+
+#include <QString>
+
+void installBreakPadHandler(const QString& name, const QString& destPath);
+
+#endif
diff --git a/src/breakpad/BreakPadDummy.cpp b/src/breakpad/BreakPadDummy.cpp
new file mode 100644
index 0000000..efab66f
--- /dev/null
+++ b/src/breakpad/BreakPadDummy.cpp
@@ -0,0 +1,7 @@
+#include "QsLog.h"
+#include "BreakPad.h"
+
+void installBreakPadHandler(const QString& name, const QString& destPath)
+{
+  QLOG_WARN() << "No crash reporting compiled.";
+}
diff --git a/src/breakpad/BreakPadLinux.cpp b/src/breakpad/BreakPadLinux.cpp
new file mode 100644
index 0000000..6822337
--- /dev/null
+++ b/src/breakpad/BreakPadLinux.cpp
@@ -0,0 +1,9 @@
+#include <client/linux/handler/exception_handler.h>
+
+#include "BreakPad.h"
+
+void installBreakPadHandler(const QString& name, const QString& destPath)
+{
+  google_breakpad::MinidumpDescriptor desc(destPath.toStdString());
+  new google_breakpad::ExceptionHandler(desc, 0, 0, 0, true, -1);
+}
diff --git a/src/breakpad/BreakPadOSX.cpp b/src/breakpad/BreakPadOSX.cpp
new file mode 100644
index 0000000..5f04ba0
--- /dev/null
+++ b/src/breakpad/BreakPadOSX.cpp
@@ -0,0 +1,17 @@
+#include <client/mac/handler/exception_handler.h>
+
+#include "BreakPad.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+static inline bool BreakPad_MinidumpCallback(const char *dump_dir, const char *minidump_id, void *context, bool succeeded)
+{
+  fprintf(stderr, "****** Plex Media Player CRASHED, CRASH REPORT WRITTEN: %s\n", dump_dir);
+  return succeeded;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void installBreakPadHandler(const QString& name, const QString& destPath)
+{
+  Q_UNUSED(name);
+  new google_breakpad::ExceptionHandler(destPath.toStdString(), NULL, BreakPad_MinidumpCallback, NULL, true, NULL);
+}
diff --git a/src/breakpad/BreakPadWin32.cpp b/src/breakpad/BreakPadWin32.cpp
new file mode 100644
index 0000000..5671506
--- /dev/null
+++ b/src/breakpad/BreakPadWin32.cpp
@@ -0,0 +1,22 @@
+#include <client/windows/handler/exception_handler.h>
+
+#include "BreakPad.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool BreakPad_MinidumpCallback(const wchar_t* dump_path,
+                               const wchar_t* minidump_id,
+                               void* context,
+                               EXCEPTION_POINTERS* exinfo,
+                               MDRawAssertionInfo* assertion,
+                               bool succeeded)
+{
+  return succeeded;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void installBreakPadHandler(const QString& name, const QString& destPath)
+{
+  new google_breakpad::ExceptionHandler(destPath.toStdWString().c_str(), NULL, BreakPad_MinidumpCallback, NULL,
+                                        google_breakpad::ExceptionHandler::HANDLER_EXCEPTION |
+                                        google_breakpad::ExceptionHandler::HANDLER_PURECALL);
+}
diff --git a/src/breakpad/CMakeLists.txt b/src/breakpad/CMakeLists.txt
new file mode 100644
index 0000000..03deec0
--- /dev/null
+++ b/src/breakpad/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_sources(BreakPad.h)
+
+if(BREAKPAD_FOUND)
+  if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    # requires Linux kernel and glibc
+    add_sources(BreakPadLinux.cpp)
+  elseif(APPLE)
+    add_sources(BreakPadOSX.cpp)
+  elseif(WIN32)
+    add_sources(BreakPadWin32.cpp)
+  else()
+    add_sources(BreakPadDummy.cpp)
+  endif()
+else()
+  add_sources(BreakPadDummy.cpp)
+endif()
diff --git a/src/breakpad/CrashDumps.h b/src/breakpad/CrashDumps.h
new file mode 100644
index 0000000..5966454
--- /dev/null
+++ b/src/breakpad/CrashDumps.h
@@ -0,0 +1,24 @@
+//
+// Created by Tobias Hieta on 26/08/15.
+//
+
+#ifndef KONVERGO_CRASHDUMPS_H
+#define KONVERGO_CRASHDUMPS_H
+
+#include "BreakPad.h"
+#include "Paths.h"
+#include "Version.h"
+
+static void setupCrashDumper()
+{
+  QDir dir(Paths::cacheDir("crashdumps/incoming/" + Version::GetCanonicalVersionString()));
+  dir.mkpath(dir.absolutePath());
+
+#ifdef NDEBUG
+  installBreakPadHandler("Plex Media Player", dir.path());
+#else
+  QLOG_INFO() << "This is a debug build. Not installing crash handler.";
+#endif
+}
+
+#endif //KONVERGO_CRASHDUMPS_H
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
new file mode 100644
index 0000000..fb284f4
--- /dev/null
+++ b/src/display/CMakeLists.txt
@@ -0,0 +1,14 @@
+if(APPLE)
+  add_subdirectory(osx)
+elseif(BUILD_TARGET STREQUAL "RPI")
+  add_subdirectory(rpi)
+elseif(X11XRANDR_FOUND)
+  add_subdirectory(x11)
+elseif(WIN32)
+  add_subdirectory(win)
+endif()
+
+add_subdirectory(dummy)
+
+find_all_sources(. SRC)
+add_sources(${SRC})
\ No newline at end of file
diff --git a/src/display/DisplayComponent.cpp b/src/display/DisplayComponent.cpp
new file mode 100644
index 0000000..bff8f78
--- /dev/null
+++ b/src/display/DisplayComponent.cpp
@@ -0,0 +1,225 @@
+
+#include "QsLog.h"
+#include "DisplayComponent.h"
+#include "DisplayManager.h"
+#include <QGuiApplication>
+#include <QWindow>
+
+#ifdef Q_OS_MAC
+#include "osx/DisplayManagerOSX.h"
+#elif defined(TARGET_RPI)
+#include "rpi/DisplayManagerRPI.h"
+#elif defined(USE_X11XRANDR)
+#include "x11/DisplayManagerX11.h"
+#elif defined(Q_OS_WIN)
+#include "win/DisplayManagerWin.h"
+#endif
+
+#include "dummy/DisplayManagerDummy.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayComponent::DisplayComponent(QObject* parent) : ComponentBase(parent), m_initTimer(this)
+{
+  m_displayManager = NULL;
+  m_lastVideoMode = -1;
+  m_lastDisplay = -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayComponent::~DisplayComponent()
+{
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayComponent::initializeDisplayManager()
+{
+  m_initTimer.setSingleShot(false);
+
+  bool res = false;
+  if (m_displayManager)
+    res = m_displayManager->initialize();
+
+  emit refreshRateChanged();
+
+  return res;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayComponent::componentInitialize()
+{
+#if 0
+  m_displayManager = new DisplayManagerDummy(this);
+#elif defined(Q_OS_MAC)
+  m_displayManager = new DisplayManagerOSX(this);
+#elif defined(TARGET_RPI)
+  m_displayManager = new DisplayManagerRPI(this);
+#elif defined(USE_X11XRANDR)
+  m_displayManager = new DisplayManagerX11(this);
+#elif defined(Q_OS_WIN)
+  m_displayManager = new DisplayManagerWin(this);
+#endif
+
+  if (initializeDisplayManager())
+  {
+    QGuiApplication* app = (QGuiApplication*)QGuiApplication::instance();
+
+    connect(app, SIGNAL(screenAdded(QScreen*)), this, SLOT(monitorChange()));
+    connect(app, SIGNAL(screenRemoved(QScreen*)), this,  SLOT(monitorChange()));
+
+    foreach (QScreen *screen, app->screens())
+    {
+      connect(screen, SIGNAL(refreshRateChanged(qreal)), this, SLOT(monitorChange()));
+      connect(screen, SIGNAL(geometryChanged(QRect)), this, SLOT(monitorChange()));
+    }
+
+#ifdef TARGET_RPI
+    // The firmware doesn't always make the best decision. Hope we do better.
+    QLOG_INFO() << "Trying to switch to best display mode.";
+    switchToBestOverallVideoMode(0);
+#endif
+
+    return true;
+  }
+
+  return false;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+void DisplayComponent::monitorChange()
+{
+  QLOG_INFO() << "Monitor change detected.";
+
+  if (!m_initTimer.isSingleShot())
+  {
+    m_initTimer.setSingleShot(true);
+    m_initTimer.singleShot(1000, this, SLOT(initializeDisplayManager()));
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayComponent::switchToBestVideoMode(float frameRate)
+{
+  if (!m_displayManager)
+    return false;
+
+  int currentDisplay = getApplicationDisplay();
+  if (currentDisplay < 0)
+    return false;
+
+  int currentMode = m_displayManager->getCurrentDisplayMode(currentDisplay);
+  if (m_lastVideoMode < 0)
+  {
+    m_lastVideoMode = currentMode;
+    m_lastDisplay = currentDisplay;
+  }
+
+  DMMatchMediaInfo matchInfo(frameRate, false);
+  int bestmode = m_displayManager->findBestMatch(currentDisplay, matchInfo);
+  if (bestmode >= 0)
+  {
+    if (bestmode != currentMode)
+    {
+      QLOG_DEBUG()
+      << "Best video matching mode is "
+      << m_displayManager->displays[currentDisplay]->videoModes[bestmode]->getPrettyName()
+      << "on display" << currentDisplay;
+
+      m_displayManager->setDisplayMode(currentDisplay, bestmode);
+      return true;
+    }
+    QLOG_INFO() << "No better video mode than the currently active one found.";
+  }
+  else
+  {
+    QLOG_DEBUG() << "No video mode found as better match.";
+  }
+
+  return false;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayComponent::switchToBestOverallVideoMode(int display)
+{
+  if (!m_displayManager || !m_displayManager->isValidDisplay(display))
+    return false;
+
+  int bestmode = m_displayManager->findBestMode(display);
+  if (bestmode < 0)
+    return false;
+
+  QLOG_INFO() << "We think mode" << bestmode << "is the best mode.";
+
+  if (bestmode == m_displayManager->getCurrentDisplayMode(display))
+  {
+    QLOG_INFO() << "This mode is the currently active one. Not switching.";
+    return false;
+  }
+
+  if (!m_displayManager->setDisplayMode(display, bestmode))
+  {
+    QLOG_INFO() << "Switching mode failed.";
+    return false;
+  }
+
+  QLOG_INFO() << "Switching mode successful.";
+  return true;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+double DisplayComponent::currentRefreshRate()
+{
+  if (!m_displayManager)
+    return 0;
+
+  int currentDisplay = getApplicationDisplay();
+  if (currentDisplay < 0)
+    return 0;
+  int mode = m_displayManager->getCurrentDisplayMode(currentDisplay);
+  if (mode < 0)
+    return 0;
+  return m_displayManager->displays[currentDisplay]->videoModes[mode]->refreshRate;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayComponent::restorePreviousVideoMode()
+{
+  if (!m_displayManager)
+    return false;
+
+  if (m_lastVideoMode < 0 || m_lastDisplay < 0)
+    return false;
+
+  bool ret = true;
+
+  if (m_displayManager->getCurrentDisplayMode(m_lastDisplay) != m_lastVideoMode)
+  {
+    QLOG_DEBUG()
+    << "Restoring VideoMode to"
+    << m_displayManager->displays[m_lastDisplay]->videoModes[m_lastVideoMode]->getPrettyName()
+    << "on display" << m_lastDisplay;
+
+    ret =  m_displayManager->setDisplayMode(m_lastDisplay, m_lastVideoMode);
+  }
+
+  m_lastVideoMode = -1;
+  m_lastDisplay = -1;
+
+  return ret;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayComponent::getApplicationDisplay()
+{
+  QWindow* activeWindow = QGuiApplication::focusWindow();
+
+  int display = -1;
+  if (activeWindow && m_displayManager)
+    display = m_displayManager->getDisplayFromPoint(activeWindow->geometry().center());
+
+  if (display < 0)
+  {
+    QLOG_WARN() << "Unable to locate current display.";
+  }
+  return display;
+}
diff --git a/src/display/DisplayComponent.h b/src/display/DisplayComponent.h
new file mode 100644
index 0000000..119be75
--- /dev/null
+++ b/src/display/DisplayComponent.h
@@ -0,0 +1,52 @@
+#ifndef DISPLAYCOMPONENT_H
+#define DISPLAYCOMPONENT_H
+
+#include "DisplayManager.h"
+#include "ComponentManager.h"
+#include <QScreen>
+#include <QTimer>
+
+class DisplayComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(DisplayComponent);
+
+public:
+  ~DisplayComponent();
+
+  virtual const char* componentName() { return "display"; }
+  virtual bool componentExport() { return true; }
+  virtual bool componentInitialize();
+
+  inline DisplayManager* getDisplayManager() { return m_displayManager; }
+  int getApplicationDisplay();
+
+  // Switch to the best video mode for the given video framerate. Return true only if the actual
+  // mode was switched. If a good match was found, but the current video mode didn't have to be
+  // changed, return false. Return false on failure too.
+  bool switchToBestVideoMode(float frameRate);
+
+  // Switch to best overall video mode. This will also switch the resolution.
+  bool switchToBestOverallVideoMode(int display);
+
+  double currentRefreshRate();
+
+private:
+  DisplayComponent(QObject *parent = 0);
+
+  DisplayManager  *m_displayManager;
+  int m_lastVideoMode;
+  int m_lastDisplay;
+  QTimer m_initTimer;
+
+public Q_SLOTS:
+  void  monitorChange();
+  bool  initializeDisplayManager();
+  bool  restorePreviousVideoMode();
+
+Q_SIGNALS:
+  void refreshRateChanged();
+
+};
+
+#endif // DISPLAYCOMPONENT_H
diff --git a/src/display/DisplayManager.cpp b/src/display/DisplayManager.cpp
new file mode 100755
index 0000000..f2e4c31
--- /dev/null
+++ b/src/display/DisplayManager.cpp
@@ -0,0 +1,226 @@
+//
+//  DisplayManager.cpp
+//  konvergo
+//
+//  Created by Lionel CHAZALLON on 28/09/2014.
+//
+//
+
+#include "QsLog.h"
+#include "DisplayManager.h"
+#include "math.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayManager::DisplayManager(QObject* parent) : QObject(parent) {}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManager::initialize()
+{
+  QLOG_INFO() << QString("DisplayManager found %1 Display(s).").arg(displays.size());
+
+  // list video modes
+  for (int displayid = 0; displayid < displays.size(); displayid++)
+  {
+    DMDisplayPtr display = displays[displayid];
+    QLOG_INFO() << QString("Available modes for Display #%1 (%2)").arg(displayid).arg(display->name);
+    for (int modeid = 0; modeid < display->videoModes.size(); modeid++)
+    {
+      DMVideoModePtr mode = display->videoModes[modeid];
+      QLOG_INFO() << QString("Mode %1: %2").arg(modeid, 2).arg(mode->getPrettyName());
+    }
+  }
+
+  // Log current display mode
+  int mainDisplay = getMainDisplay();
+  if (mainDisplay >= 0)
+  {
+    int currentMode = getCurrentDisplayMode(mainDisplay);
+    if (currentMode >= 0)
+      QLOG_INFO() << QString("DisplayManager : Current Display Mode on Display #%1 is %2")
+                     .arg(mainDisplay)
+                     .arg(displays[mainDisplay]->videoModes[currentMode]->getPrettyName());
+    else
+      QLOG_ERROR() << "DisplayManager : unable to retrieve current video mode";
+  }
+  else
+    QLOG_ERROR() << "DisplayManager : unable to retrieve main display";
+
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DMVideoModePtr DisplayManager::getCurrentVideoMode(int display)
+{
+  int currentMode = getCurrentDisplayMode(display);
+  DMVideoModePtr currentVideoMode;
+
+  if (currentMode >= 0)
+    currentVideoMode = displays[display]->videoModes[currentMode];
+
+  return currentVideoMode;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManager::isValidDisplay(int display) { return display < displays.size(); }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManager::isValidDisplayMode(int display, int mode)
+{
+  if (display < displays.size())
+    if (displays[display]->videoModes.size() > mode)
+      return true;
+
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManager::isRateMultipleOf(float refresh, float multiple, bool exact)
+{
+  if (((int)refresh == 0) || ((int)multiple == 0))
+      return false;
+
+  if (((int)multiple % (int)refresh) == 0)
+    return true;
+
+  int roundedRefresh = (int)round(refresh);
+  int roundedMultiple = (int)round(multiple);
+  if (((roundedMultiple % roundedRefresh) == 0) && (!exact))
+    return true;
+
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManager::findBestMatch(int display, DMMatchMediaInfo& matchInfo)
+{
+
+  // Grab current videomode information
+  DMVideoModePtr currentVideoMode = getCurrentVideoMode(display);
+  if (!currentVideoMode)
+    return -1;
+
+  // now we try to find the exact match in current resolution
+  // then fill a list
+  DMVideoModeWeightMap weights;
+
+  DMVideoModeMap::const_iterator modeit = displays[display]->videoModes.constBegin();
+
+  while (modeit != displays[display]->videoModes.constEnd())
+  {
+    DMVideoModePtr candidate = modeit.value();
+
+    weights[candidate->id] = DMVideoModeWeightPtr(new DMVideoModeWeight);
+    weights[candidate->id]->mode = candidate;
+    weights[candidate->id]->weight = 0;
+
+    // Weight Resolution match
+    if ((candidate->width == currentVideoMode->width) &&
+        (candidate->height == currentVideoMode->height) &&
+        (candidate->bitsPerPixel == currentVideoMode->bitsPerPixel))
+    {
+      weights[candidate->id]->weight += MATCH_WEIGHT_RES;
+    }
+
+    // weight refresh rate
+    // exact Match
+    if (candidate->refreshRate == matchInfo.refreshRate)
+      weights[candidate->id]->weight += MATCH_WEIGHT_REFRESH_RATE_EXACT;
+
+    // exact multiple refresh rate
+    if (isRateMultipleOf(matchInfo.refreshRate, candidate->refreshRate, true))
+      weights[candidate->id]->weight += MATCH_WEIGHT_REFRESH_RATE_MULTIPLE;
+
+    // close refresh match (less than 1 hz diff to match all 23.xxx modes to 24p)
+    if (fabs(candidate->refreshRate - matchInfo.refreshRate) <= 1)
+    {
+      weights[candidate->id]->weight += MATCH_WEIGHT_REFRESH_RATE_CLOSE;
+    }
+
+    // approx multiple refresh rate
+    if (isRateMultipleOf(matchInfo.refreshRate, candidate->refreshRate, false))
+      weights[candidate->id]->weight += MATCH_WEIGHT_REFRESH_RATE_MULTIPLE_CLOSE;
+
+    // weight interlacing
+    if (candidate->interlaced == matchInfo.interlaced)
+      weights[candidate->id]->weight += MATCH_WEIGHT_INTERLACE;
+
+    if (candidate->id == currentVideoMode->id)
+      weights[candidate->id]->weight += MATCH_WEIGHT_CURRENT;
+
+    modeit++;
+  }
+
+  // now grab the mode with the highest weight
+  DMVideoModeWeightPtr chosen;
+  float maxWeight = 0;
+
+  DMVideoModeWeightMap::const_iterator weightit = weights.constBegin();
+  while (weightit != weights.constEnd())
+  {
+    QLOG_DEBUG() << "Mode " << weightit.value()->mode->id << "("
+                 << weightit.value()->mode->getPrettyName() << ") has weight "
+                 << weightit.value()->weight;
+    if (weightit.value()->weight > maxWeight)
+    {
+      chosen = weightit.value();
+      maxWeight = chosen->weight;
+    }
+
+    weightit++;
+  }
+
+  if ((chosen) && (chosen->weight > MATCH_WEIGHT_RES))
+  {
+    QLOG_INFO() << "DisplayManager RefreshMatch : found a suitable mode : "
+                << chosen->mode->getPrettyName();
+    return chosen->mode->id;
+  }
+
+  QLOG_INFO() << "DisplayManager RefreshMatch : found no suitable videomode";
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManager::findBestMode(int display)
+{
+  int best_mode = -1;
+
+  foreach (auto mode, displays[display]->videoModes)
+  {
+    if (best_mode < 0)
+    {
+      best_mode = mode->id;
+    }
+    else
+    {
+      DMVideoModePtr best = displays[display]->videoModes[best_mode];
+      DMVideoModePtr candidate = mode;
+
+      // Highest priority: prefer non-interlaced modes.
+      if (!best->interlaced && candidate->interlaced)
+        continue;
+
+      if (best->bitsPerPixel > candidate->bitsPerPixel)
+        continue;
+
+      if (best->width > candidate->width)
+        continue;
+
+      if (best->height > candidate->height)
+        continue;
+
+      if (best->refreshRate > candidate->refreshRate)
+        continue;
+
+      best_mode = candidate->id;
+    }
+  }
+
+  return best_mode;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManager::getDisplayFromPoint(const QPoint& pt)
+{
+  return getDisplayFromPoint(pt.x(), pt.y());
+}
diff --git a/src/display/DisplayManager.h b/src/display/DisplayManager.h
new file mode 100644
index 0000000..2691868
--- /dev/null
+++ b/src/display/DisplayManager.h
@@ -0,0 +1,134 @@
+//
+//  DisplayManager.h
+//  konvergo
+//
+//  Created by Lionel CHAZALLON on 28/09/2014.
+//
+//
+
+#ifndef _DISPLAYMANAGER_H_
+#define _DISPLAYMANAGER_H_
+
+#include <QMap>
+#include <QPoint>
+#include <QString>
+#include <QSharedPointer>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Video Modes
+class DMVideoMode
+{
+public:
+  int id;
+  int width;
+  int height;
+  int bitsPerPixel;
+  float refreshRate;
+  bool interlaced;
+
+  int priv_id;
+
+  inline QString getPrettyName()
+  {
+    QString name;
+
+    name = QString("%1 x%2%3").arg(width, 5).arg(height, 5).arg((interlaced ? "i" : " "));
+    name += QString("x %1bpp @%2Hz").arg(bitsPerPixel, 2).arg(refreshRate);
+    return name;
+  }
+};
+
+typedef QSharedPointer<DMVideoMode> DMVideoModePtr;
+typedef QMap<int, DMVideoModePtr> DMVideoModeMap;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Displays
+class DMDisplay
+{
+public:
+  int id;
+  QString name;
+
+  int priv_id;
+
+  DMVideoModeMap videoModes;
+};
+
+typedef QSharedPointer<DMDisplay> DMDisplayPtr;
+typedef QMap<int, DMDisplayPtr> DMDisplayMap;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// MatchMediaInfo
+class DMMatchMediaInfo
+{
+public:
+  DMMatchMediaInfo() : refreshRate(0), interlaced(false) {};
+  DMMatchMediaInfo(float refreshRate, bool interlaced)
+    : refreshRate(refreshRate), interlaced(interlaced) {};
+
+  float refreshRate;
+  bool interlaced;
+};
+
+// Matching weights
+#define MATCH_WEIGHT_RES 1000
+
+#define MATCH_WEIGHT_REFRESH_RATE_EXACT               100
+#define MATCH_WEIGHT_REFRESH_RATE_MULTIPLE            75
+#define MATCH_WEIGHT_REFRESH_RATE_CLOSE               50
+#define MATCH_WEIGHT_REFRESH_RATE_MULTIPLE_CLOSE      25
+
+#define MATCH_WEIGHT_INTERLACE 10
+
+#define MATCH_WEIGHT_CURRENT 5
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// VideoMode Weight
+class DMVideoModeWeight
+{
+public:
+  float weight;
+  DMVideoModePtr mode;
+};
+
+typedef QSharedPointer<DMVideoModeWeight> DMVideoModeWeightPtr;
+typedef QMap<int, DMVideoModeWeightPtr> DMVideoModeWeightMap;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// DisplayManager
+class DisplayManager : public QObject
+{
+  Q_OBJECT
+public:
+  DisplayManager(QObject* parent);
+  virtual ~DisplayManager() {}
+
+  DMDisplayMap displays;
+
+  // functions that should be implemented on each platform
+  virtual bool initialize();
+  virtual bool setDisplayMode(int display, int mode) = 0;
+  virtual int getCurrentDisplayMode(int display) = 0;
+  virtual int getMainDisplay() = 0;
+  virtual int getDisplayFromPoint(int x, int y) = 0;
+
+  // extra functions that can be implemented
+  virtual void resetRendering() {}
+
+  // other classes functions
+  int findBestMatch(int display, DMMatchMediaInfo& matchInfo);
+  DMVideoModePtr getCurrentVideoMode(int display);
+
+  int findBestMode(int display);
+  
+  bool isValidDisplay(int display);
+  bool isValidDisplayMode(int display, int mode);
+  int getDisplayFromPoint(const QPoint& pt);
+
+private:
+  bool isRateMultipleOf(float refresh, float multiple, bool exact = true);
+};
+
+typedef QSharedPointer<DisplayManager> DisplayManagerPtr;
+
+#endif /* _DISPLAYMANAGER_H_ */
diff --git a/src/display/dummy/CMakeLists.txt b/src/display/dummy/CMakeLists.txt
new file mode 100644
index 0000000..b0e41b9
--- /dev/null
+++ b/src/display/dummy/CMakeLists.txt
@@ -0,0 +1 @@
+add_sources(DisplayManagerDummy.cpp DisplayManagerDummy.h)
\ No newline at end of file
diff --git a/src/display/dummy/DisplayManagerDummy.cpp b/src/display/dummy/DisplayManagerDummy.cpp
new file mode 100644
index 0000000..025b1a3
--- /dev/null
+++ b/src/display/dummy/DisplayManagerDummy.cpp
@@ -0,0 +1,75 @@
+#include "QsLog.h"
+#include "DisplayManagerDummy.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void DisplayManagerDummy::addMode(float rate)
+{
+  if (!displays.size())
+    return;
+
+  DMVideoModePtr mode = DMVideoModePtr(new DMVideoMode());
+  mode->id = displays[0]->videoModes.size();
+  mode->interlaced = false;
+  mode->refreshRate = rate;
+  mode->width = 1280;
+  mode->height = 720;
+  mode->bitsPerPixel = 0;
+  displays[0]->videoModes[mode->id] = mode;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerDummy::initialize()
+{
+  displays.clear();
+
+  DMDisplayPtr display = DMDisplayPtr(new DMDisplay());
+  display->id = displays.size();
+  display->name = "Dummy display";
+  displays[display->id] = display;
+
+  addMode(60);
+
+  return DisplayManager::initialize();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerDummy::setDisplayMode(int display, int mode)
+{
+  if (!isValidDisplayMode(display, mode))
+    return false;
+
+  DMDisplayPtr displayptr = displays[display];
+  DMVideoModePtr videomode = displayptr->videoModes[mode];
+
+  QLOG_INFO() << "Switching to" << videomode->width << "x" << videomode->height << "@" << videomode->refreshRate;
+
+  m_currentMode = videomode->id;
+
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerDummy::getCurrentDisplayMode(int display)
+{
+  if (!isValidDisplay(display))
+    return -1;
+
+  return m_currentMode;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerDummy::getMainDisplay()
+{
+  return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerDummy::getDisplayFromPoint(int x, int y)
+{
+  if (displays.size())
+  {
+    if (x >= 0 && y >= 0 && x < 1280 && y < 720)
+      return 0;
+  }
+  return -1;
+}
diff --git a/src/display/dummy/DisplayManagerDummy.h b/src/display/dummy/DisplayManagerDummy.h
new file mode 100644
index 0000000..cc473a7
--- /dev/null
+++ b/src/display/dummy/DisplayManagerDummy.h
@@ -0,0 +1,25 @@
+#ifndef DISPLAYMANAGERDUMMY_H_
+#define DISPLAYMANAGERDUMMY_H_
+
+#include "display/DisplayManager.h"
+
+class DisplayManagerDummy : public DisplayManager
+{
+  Q_OBJECT
+private:
+
+  void addMode(float rate);
+
+  int m_currentMode;
+
+public:
+  DisplayManagerDummy(QObject* parent) : DisplayManager(parent), m_currentMode(0) {};
+
+  virtual bool initialize();
+  virtual bool setDisplayMode(int display, int mode);
+  virtual int getCurrentDisplayMode(int display);
+  virtual int getMainDisplay();
+  virtual int getDisplayFromPoint(int x, int y);
+};
+
+#endif /* DISPLAYMANAGERX11_H_ */
diff --git a/src/display/osx/CMakeLists.txt b/src/display/osx/CMakeLists.txt
new file mode 100644
index 0000000..d88261a
--- /dev/null
+++ b/src/display/osx/CMakeLists.txt
@@ -0,0 +1 @@
+add_sources(DisplayManagerOSX.cpp DisplayManagerOSX.h)
diff --git a/src/display/osx/DisplayManagerOSX.cpp b/src/display/osx/DisplayManagerOSX.cpp
new file mode 100644
index 0000000..47498cb
--- /dev/null
+++ b/src/display/osx/DisplayManagerOSX.cpp
@@ -0,0 +1,155 @@
+//
+//  DisplayManagerOSX.cpp
+//  konvergo
+//
+//  Created by Lionel CHAZALLON on 28/09/2014.
+//
+//
+
+#include <CoreGraphics/CoreGraphics.h>
+#include "utils/osx/OSXUtils.h"
+#include "DisplayManagerOSX.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerOSX::initialize()
+{
+  int totalModes = 0;
+  
+  CGGetActiveDisplayList(MAX_DISPLAYS, m_osxDisplays, &m_osxnumDisplays);
+  displays.clear();
+
+  for (int displayid = 0; displayid < m_osxnumDisplays; displayid++)
+  {
+    // add the display to the list
+    DMDisplayPtr display = DMDisplayPtr(new DMDisplay);
+    display->id = displayid;
+    display->name = QString("Display %1").arg(displayid);
+    displays[display->id] = display;
+
+    m_osxDisplayModes[displayid] = CGDisplayCopyAllDisplayModes(m_osxDisplays[displayid], NULL);
+    if (!m_osxDisplayModes[displayid])
+      continue;
+
+    int numModes = (int)CFArrayGetCount(m_osxDisplayModes[displayid]);
+
+    for (int modeid = 0; modeid < numModes; modeid++)
+    {
+      totalModes++;
+      
+      // add the videomode to the display
+      DMVideoModePtr mode = DMVideoModePtr(new DMVideoMode);
+      mode->id = modeid;
+      display->videoModes[modeid] = mode;
+
+      // grab videomode info
+      CGDisplayModeRef displayMode =
+      (CGDisplayModeRef)CFArrayGetValueAtIndex(m_osxDisplayModes[displayid], modeid);
+
+      mode->height = CGDisplayModeGetHeight(displayMode);
+      mode->width = CGDisplayModeGetWidth(displayMode);
+      mode->refreshRate = CGDisplayModeGetRefreshRate(displayMode);
+
+      CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(displayMode);
+
+      if (CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) ==
+          kCFCompareEqualTo)
+        mode->bitsPerPixel = 32;
+      else if (CFStringCompare(pixEnc, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) ==
+               kCFCompareEqualTo)
+        mode->bitsPerPixel = 16;
+      else if (CFStringCompare(pixEnc, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) ==
+               kCFCompareEqualTo)
+        mode->bitsPerPixel = 8;
+
+      mode->interlaced = (CGDisplayModeGetIOFlags(displayMode) & kDisplayModeInterlacedFlag) > 0;
+
+      if (mode->refreshRate == 0)
+        mode->refreshRate = 60;
+    }
+  }
+
+  if (totalModes == 0)
+    return false;
+  else
+    return DisplayManager::initialize();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerOSX::setDisplayMode(int display, int mode)
+{
+  if (!isValidDisplayMode(display, mode) || !m_osxDisplayModes[display])
+    return false;
+  
+  CGDisplayModeRef displayMode =
+  (CGDisplayModeRef)CFArrayGetValueAtIndex(m_osxDisplayModes[display], mode);
+
+  CGDisplaySetDisplayMode(m_osxDisplays[display], displayMode, NULL);
+
+  // HACK : on OSX, switching display mode can leave dock in a state where mouse cursor
+  // will not hide on top of hidden dock, so we reset it state to fix this
+  OSXUtils::SetMenuBarVisible(true);
+  OSXUtils::SetMenuBarVisible(false);
+
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerOSX::getCurrentDisplayMode(int display)
+{
+  if (!isValidDisplay(display) || !m_osxDisplayModes[display])
+    return -1;
+  
+  CGDisplayModeRef currentMode = CGDisplayCopyDisplayMode(m_osxDisplays[display]);
+
+  for (int mode = 0; mode < CFArrayGetCount(m_osxDisplayModes[display]); mode++)
+  {
+    if (currentMode == (CGDisplayModeRef)CFArrayGetValueAtIndex(m_osxDisplayModes[display], mode))
+    {
+      return mode;
+    }
+  }
+
+  return -1;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerOSX::getMainDisplay()
+{
+  CGDirectDisplayID mainID = CGMainDisplayID();
+
+  for (int i = 0; i < m_osxnumDisplays; i++)
+  {
+    if (m_osxDisplays[i] == mainID)
+      return i;
+  }
+
+  return -1;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayManagerOSX::~DisplayManagerOSX()
+{
+  for (int i = 0; i < m_osxDisplayModes.size(); i++)
+  {
+    if (m_osxDisplayModes[i])
+      CFRelease(m_osxDisplayModes[i]);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerOSX::getDisplayFromPoint(int x, int y)
+{
+  CGPoint point = { (double)x, (double)y };
+  CGDirectDisplayID foundDisplay;
+  uint32_t numFound;
+
+  CGGetDisplaysWithPoint(point, 1, &foundDisplay, &numFound);
+
+  for (int i=0; i<m_osxnumDisplays; i++)
+  {
+    if (foundDisplay == m_osxDisplays[i])
+      return i;
+  }
+
+  return -1;
+}
diff --git a/src/display/osx/DisplayManagerOSX.h b/src/display/osx/DisplayManagerOSX.h
new file mode 100644
index 0000000..65a8b3a
--- /dev/null
+++ b/src/display/osx/DisplayManagerOSX.h
@@ -0,0 +1,42 @@
+//
+//  DisplayManagerOSX.h
+//  konvergo
+//
+//  Created by Lionel CHAZALLON on 28/09/2014.
+//
+//
+
+#ifndef _DISPLAYMANAGEROSX_H_
+#define _DISPLAYMANAGEROSX_H_
+
+#include "ApplicationServices/ApplicationServices.h"
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFDictionary.h>
+
+#include "display/DisplayManager.h"
+
+#define MAX_DISPLAYS 32
+
+typedef std::map<int, CFArrayRef> OSXDisplayModeMap;
+
+class DisplayManagerOSX : public DisplayManager
+{
+  Q_OBJECT
+private:
+  // OSX Display/ VideoMode handling structs
+  uint32_t m_osxnumDisplays;
+  CGDirectDisplayID m_osxDisplays[MAX_DISPLAYS];
+  OSXDisplayModeMap m_osxDisplayModes;
+
+public:
+  DisplayManagerOSX(QObject* parent) : DisplayManager(parent) {};
+  virtual ~DisplayManagerOSX();
+
+  virtual bool initialize();
+  virtual bool setDisplayMode(int display, int mode);
+  virtual int getCurrentDisplayMode(int display);
+  virtual int getMainDisplay();
+  virtual int getDisplayFromPoint(int x, int y);
+};
+
+#endif /* _DISPLAYMANAGEROSX_H_ */
diff --git a/src/display/rpi/CMakeLists.txt b/src/display/rpi/CMakeLists.txt
new file mode 100644
index 0000000..f46472c
--- /dev/null
+++ b/src/display/rpi/CMakeLists.txt
@@ -0,0 +1 @@
+add_sources(DisplayManagerRPI.cpp DisplayManagerRPI.h)
diff --git a/src/display/rpi/DisplayManagerRPI.cpp b/src/display/rpi/DisplayManagerRPI.cpp
new file mode 100644
index 0000000..6a5cbd6
--- /dev/null
+++ b/src/display/rpi/DisplayManagerRPI.cpp
@@ -0,0 +1,182 @@
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+#include <QQuickWindow>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
+
+#include "QsLog.h"
+#include "DisplayManagerRPI.h"
+#include "display/DisplayComponent.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void DisplayManagerRPI::tv_callback(void *callback_data, uint32_t reason, uint32_t param1, uint32_t param2)
+{
+  DisplayManagerRPI* obj = (DisplayManagerRPI *)callback_data;
+
+  emit obj->onTvChange(reason);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayManagerRPI::DisplayManagerRPI(QObject* parent) : DisplayManager(parent)
+{
+  connect(this, &DisplayManagerRPI::onTvChange,
+          this, &DisplayManagerRPI::handleTvChange,
+          Qt::QueuedConnection);
+
+  vc_tv_register_callback(&tv_callback, (void *)this);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayManagerRPI::~DisplayManagerRPI()
+{
+  vc_tv_unregister_callback_full(&tv_callback, (void *)this);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void DisplayManagerRPI::handleTvChange(uint32_t reason)
+{
+  QLOG_INFO() << "tv_service notification:" << reason;
+
+  if (reason & (VC_HDMI_DVI | VC_HDMI_HDMI))
+  {
+    // Looks like a mode change - Qt's dispmanx state is probably trashed, recreate it.
+    resetRendering();
+  }
+  else if (reason & VC_HDMI_ATTACHED)
+  {
+    // Plugged in, but is in standby mode. May happen when reconnecting a monitor via HDMI.
+    QLOG_INFO() << "Powering on screen.";
+    DisplayComponent::Get().switchToBestOverallVideoMode(0);
+  }
+  else if (reason & VC_HDMI_UNPLUGGED)
+  {
+    QLOG_INFO() << "Screen was unplugged.";
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static void get_modes(std::vector<TV_SUPPORTED_MODE_NEW_T>& modes, HDMI_RES_GROUP_T group)
+{
+  const int max_modes = 256;
+
+  size_t count = modes.size();
+  modes.resize(count + max_modes);
+
+  HDMI_RES_GROUP_T preferred_group;
+  uint32_t preferred_mode;
+  int got = vc_tv_hdmi_get_supported_modes_new(group, &modes[count], max_modes, &preferred_group, &preferred_mode);
+  modes.resize(count + got);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerRPI::initialize()
+{
+  bcm_host_init();
+
+  displays.clear();
+
+  // create the main display
+  DMDisplayPtr display = DMDisplayPtr(new DMDisplay);
+  display->id = 0;
+  display->name = "Display";
+  displays[display->id] = display;
+
+  // fills mode array with both CEA and DMT
+  m_modes.resize(0);
+  get_modes(m_modes, HDMI_RES_GROUP_CEA); // TV
+  get_modes(m_modes, HDMI_RES_GROUP_DMT); // PC
+
+  for (size_t n = 0; n < m_modes.size(); n++)
+  {
+    TV_SUPPORTED_MODE_NEW_T* tvmode = &m_modes[n];
+    DMVideoModePtr mode = DMVideoModePtr(new DMVideoMode);
+    mode->id = n;
+    display->videoModes[mode->id] = mode;
+
+    mode->height = tvmode->height;
+    mode->width = tvmode->width;
+    mode->refreshRate = tvmode->frame_rate;
+    mode->interlaced = (tvmode->scan_mode == 1);
+    mode->bitsPerPixel = 32;
+  }
+
+  if (m_modes.size() == 0)
+    return false;
+  else
+    return DisplayManager::initialize();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerRPI::setDisplayMode(int display, int mode)
+{
+  if (!isValidDisplayMode(display, mode))
+    return false;
+
+  TV_SUPPORTED_MODE_NEW_T* tvmode = &m_modes[mode];
+  bool ret = vc_tv_hdmi_power_on_explicit_new(HDMI_MODE_HDMI, (HDMI_RES_GROUP_T)tvmode->group, tvmode->code) == 0;
+  if (!ret)
+  {
+    QLOG_ERROR() << "Failed to switch display mode" << ret;
+  }
+
+  return ret;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerRPI::getCurrentDisplayMode(int display)
+{
+  if (!isValidDisplay(display))
+    return -1;
+
+  TV_GET_STATE_RESP_T tvstate;
+  if (vc_tv_get_state(&tvstate))
+    return -1;
+
+  for (int mode = 0; mode < displays[display]->videoModes.size(); mode++)
+  {
+    TV_SUPPORTED_MODE_NEW_T* tvmode = &m_modes[mode];
+    if (tvmode->width == tvstate.width &&
+        tvmode->height == tvstate.height &&
+        tvmode->frame_rate == tvstate.frame_rate &&
+        tvmode->scan_mode == tvstate.scan_mode)
+      return mode;
+  }
+
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void DisplayManagerRPI::resetRendering()
+{
+  QGuiApplication *guiApp = (QGuiApplication*)QGuiApplication::instance();
+  QQuickWindow *window = (QQuickWindow*)guiApp->focusWindow();
+  if (window)
+  {
+    QLOG_INFO() << "Recreating Qt UI renderer";
+
+    // destroy the window to reset  OpenGL context
+    window->setPersistentOpenGLContext(false);
+    window->setPersistentSceneGraph(false);
+    window->destroy();
+
+    // Grab the Platform integration private object and recreate it
+    // this allows to clean / recreate the dispmanx objects
+    QGuiApplicationPrivate *privateApp = (QGuiApplicationPrivate *)QGuiApplicationPrivate::get(guiApp);
+    QPlatformIntegration *integration = privateApp->platformIntegration();
+
+    if (integration)
+    {
+      integration->destroy();
+      QThread::msleep(500);
+      integration->initialize();
+    }
+    else
+    {
+      QLOG_ERROR() << "Failed to retrieve platform integration";
+    }
+
+    // now recreate the window OpenGL context
+    window->setScreen(QGuiApplication::primaryScreen());
+    window->create();
+  }
+}
diff --git a/src/display/rpi/DisplayManagerRPI.h b/src/display/rpi/DisplayManagerRPI.h
new file mode 100644
index 0000000..e259165
--- /dev/null
+++ b/src/display/rpi/DisplayManagerRPI.h
@@ -0,0 +1,36 @@
+#ifndef DISPLAYMANAGERRPI_H
+#define DISPLAYMANAGERRPI_H
+
+#include <vector>
+#include <bcm_host.h>
+#include <interface/vmcs_host/vc_tvservice.h>
+
+#include "display/DisplayManager.h"
+
+class DisplayManagerRPI : public DisplayManager
+{
+  Q_OBJECT
+private:
+  std::vector<TV_SUPPORTED_MODE_NEW_T> m_modes;
+
+private Q_SLOTS:
+  void handleTvChange(uint32_t reason);
+
+  static void tv_callback(void *callback_data, uint32_t reason, uint32_t param1, uint32_t param2);
+
+Q_SIGNALS:
+  void onTvChange(uint32_t reason);
+
+public:
+  DisplayManagerRPI(QObject* parent);
+  virtual ~DisplayManagerRPI();
+
+  virtual bool initialize();
+  virtual void resetRendering();
+  virtual bool setDisplayMode(int display, int mode);
+  virtual int getCurrentDisplayMode(int display);
+  virtual int getMainDisplay() { return 0; }
+  virtual int getDisplayFromPoint(int x, int y) { return 0; }
+};
+
+#endif
diff --git a/src/display/win/CMakeLists.txt b/src/display/win/CMakeLists.txt
new file mode 100644
index 0000000..a8b7e3d
--- /dev/null
+++ b/src/display/win/CMakeLists.txt
@@ -0,0 +1 @@
+add_sources(DisplayManagerWin.cpp DisplayManagerWin.h)
diff --git a/src/display/win/DisplayManagerWin.cpp b/src/display/win/DisplayManagerWin.cpp
new file mode 100644
index 0000000..b61d730
--- /dev/null
+++ b/src/display/win/DisplayManagerWin.cpp
@@ -0,0 +1,212 @@
+//
+//  DisplayManagerWin.cpp
+//  konvergo
+//
+//  Created by Lionel CHAZALLON on 18/06/2015.
+//
+//
+
+#include <QRect>
+
+#include "QsLog.h"
+#include "DisplayManagerWin.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerWin::initialize()
+{
+  DISPLAY_DEVICEW displayInfo;
+  int displayId = 0;
+
+  while (getDisplayInfo(displayId, displayInfo))
+  {
+    if (displayInfo.StateFlags & (DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED))
+    {
+      DEVMODEW modeInfo;
+      int modeId = 0;
+
+      // add the display
+      DMDisplayPtr display = DMDisplayPtr(new DMDisplay);
+      display->id = displayId;
+      display->name = QString::fromWCharArray(displayInfo.DeviceString);
+      displays[display->id] = DMDisplayPtr(display);
+      m_displayAdapters[display->id] = QString::fromWCharArray(displayInfo.DeviceName);
+
+      while (getModeInfo(displayId, modeId, modeInfo))
+      {
+        // add the videomode to the display
+        DMVideoModePtr videoMode = DMVideoModePtr(new DMVideoMode);
+        videoMode->id = modeId;
+        display->videoModes[videoMode->id] = videoMode;
+
+        // setup mode information
+        videoMode->height = modeInfo.dmPelsHeight;
+        videoMode->width = modeInfo.dmPelsWidth;
+        videoMode->refreshRate = modeInfo.dmDisplayFrequency;
+        videoMode->bitsPerPixel = modeInfo.dmBitsPerPel;
+        videoMode->interlaced = (modeInfo.dmDisplayFlags & DM_INTERLACED) ? true : false;
+
+        // Windows just returns interger refresh rate so
+        // let's fudge it
+        if (videoMode->refreshRate == 59 ||
+            videoMode->refreshRate == 29 ||
+            videoMode->refreshRate == 23)
+           videoMode->refreshRate = (float)(videoMode->refreshRate + 1) / 1.001f;
+
+        modeId++;
+      }
+    }
+
+    displayId++;
+  }
+
+  if (displays.size() == 0)
+  {
+    QLOG_DEBUG() << "No display found.";
+    return false;
+  }
+  else
+    return DisplayManager::initialize();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerWin::setDisplayMode(int display, int mode)
+{
+  DEVMODEW modeInfo;
+
+  if (!isValidDisplayMode(display, mode))
+    return false;
+
+  if (getModeInfo(display, mode, modeInfo))
+  {
+    modeInfo.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY | DM_DISPLAYFLAGS;
+
+    LONG rc = ChangeDisplaySettingsExW((LPCWSTR)m_displayAdapters[display].utf16(), &modeInfo, NULL,
+                                       CDS_FULLSCREEN, NULL);
+
+    if (rc != DISP_CHANGE_SUCCESSFUL)
+    {
+      QLOG_ERROR() << "Failed to changed DisplayMode, error" << rc;
+      return false;
+    }
+    else
+    {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerWin::getCurrentDisplayMode(int display)
+{
+  if (!isValidDisplay(display))
+    return -1;
+
+  // grab current mode
+  DEVMODEW modeInfo;
+  ZeroMemory(&modeInfo, sizeof(modeInfo));
+  modeInfo.dmSize = sizeof(modeInfo);
+
+  // grab current mode info
+  if (!EnumDisplaySettingsW((LPCWSTR)m_displayAdapters[display].utf16(), ENUM_CURRENT_SETTINGS,
+                            &modeInfo))
+  {
+    QLOG_ERROR() << "Failed to retrieve current mode";
+    return -1;
+  }
+
+  // check if current mode info matches on of our modes
+  for (int modeId = 0; modeId < displays[display]->videoModes.size(); modeId++)
+  {
+    if (isModeMatching(modeInfo, displays[display]->videoModes[modeId]))
+      return modeId;
+  }
+
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerWin::getMainDisplay()
+{
+  DISPLAY_DEVICEW displayInfo;
+  int displayId = 0;
+
+  while (getDisplayInfo(displayId, displayInfo))
+  {
+    if (displayInfo.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE)
+      return displayId;
+
+    displayId++;
+  }
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayManagerWin::~DisplayManagerWin()
+{
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerWin::getDisplayFromPoint(int x, int y)
+{
+  for (int displayId = 0; displayId < displays.size(); displayId++)
+  {
+    int currentMode = getCurrentDisplayMode(displayId);
+    if (currentMode > 0)
+    {
+      DEVMODEW modeInfo;
+      if (getModeInfo(displayId, currentMode, modeInfo))
+      {
+        QRect displayRect(modeInfo.dmPosition.x, modeInfo.dmPosition.y, modeInfo.dmPelsWidth,
+                          modeInfo.dmPelsHeight);
+
+        if (displayRect.contains(x, y))
+          return displayId;
+      }
+    }
+  }
+
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerWin::getDisplayInfo(int display, DISPLAY_DEVICEW& info)
+{
+  ZeroMemory(&info, sizeof(info));
+  info.cb = sizeof(info);
+  return EnumDisplayDevicesW(NULL, display, &info, 0);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerWin::getModeInfo(int display, int mode, DEVMODEW& info)
+{
+  DISPLAY_DEVICEW displayInfo;
+
+  if (m_displayAdapters.contains(display))
+  {
+    ZeroMemory(&info, sizeof(info));
+    info.dmSize = sizeof(info);
+
+    return EnumDisplaySettingsExW((LPCWSTR)m_displayAdapters[display].utf16(), mode, &info, 0);
+  }
+
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerWin::isModeMatching(DEVMODEW& modeInfo, DMVideoModePtr videoMode)
+{
+  if (videoMode->height != modeInfo.dmPelsHeight)
+    return false;
+  if (videoMode->width != modeInfo.dmPelsWidth)
+    return false;
+  if (videoMode->refreshRate != modeInfo.dmDisplayFrequency)
+    return false;
+  if (videoMode->bitsPerPixel != modeInfo.dmBitsPerPel)
+    return false;
+  if (videoMode->interlaced != (modeInfo.dmDisplayFlags & DM_INTERLACED) ? true : false)
+    return false;
+
+  return true;
+}
diff --git a/src/display/win/DisplayManagerWin.h b/src/display/win/DisplayManagerWin.h
new file mode 100644
index 0000000..f8bd511
--- /dev/null
+++ b/src/display/win/DisplayManagerWin.h
@@ -0,0 +1,30 @@
+#ifndef DISPLAYMANAGERWIN_H
+#define DISPLAYMANAGERWIN_H
+
+#include <windows.h>
+#include "display/DisplayManager.h"
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Displays
+
+class DisplayManagerWin : public DisplayManager
+{
+  Q_OBJECT
+private:
+  bool getDisplayInfo(int display, DISPLAY_DEVICEW& info);
+  bool getModeInfo(int display, int mode, DEVMODEW& info);
+  bool isModeMatching(DEVMODEW& modeInfo, DMVideoModePtr videoMode);
+
+  QMap<int, QString> m_displayAdapters;
+
+public:
+  DisplayManagerWin(QObject* parent) : DisplayManager(parent) {}
+  virtual ~DisplayManagerWin();
+
+  virtual bool initialize();
+  virtual bool setDisplayMode(int display, int mode);
+  virtual int getCurrentDisplayMode(int display);
+  virtual int getMainDisplay();
+  virtual int getDisplayFromPoint(int x, int y);
+};
+
+#endif // DISPLAYMANAGERWIN_H
diff --git a/src/display/x11/CMakeLists.txt b/src/display/x11/CMakeLists.txt
new file mode 100644
index 0000000..55ac163
--- /dev/null
+++ b/src/display/x11/CMakeLists.txt
@@ -0,0 +1 @@
+add_sources(DisplayManagerX11.cpp DisplayManagerX11.h)
diff --git a/src/display/x11/DisplayManagerX11.cpp b/src/display/x11/DisplayManagerX11.cpp
new file mode 100755
index 0000000..567aeb6
--- /dev/null
+++ b/src/display/x11/DisplayManagerX11.cpp
@@ -0,0 +1,215 @@
+#include "DisplayManagerX11.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerX11::initialize()
+{
+  displays.clear();
+
+  if (!xdisplay)
+    xdisplay = XOpenDisplay(NULL);
+  if (!xdisplay)
+    return false;
+
+  int event_base, error_base;
+  if (!XRRQueryExtension(xdisplay, &event_base, &error_base))
+    return false;
+
+  if (resources)
+    XRRFreeScreenResources(resources);
+
+  resources = XRRGetScreenResources(xdisplay, RootWindow(xdisplay, DefaultScreen(xdisplay)));
+  if (!resources)
+    return false;
+
+  for (int o = 0; o < resources->noutput; o++) {
+    RROutput output = resources->outputs[o];
+    XRRCrtcInfo *crtc = NULL;
+    XRROutputInfo *out = XRRGetOutputInfo(xdisplay, resources, output);
+    if (!out || !out->crtc)
+      goto next;
+    crtc = XRRGetCrtcInfo(xdisplay, resources, out->crtc);
+    if (!crtc)
+      goto next;
+
+    {
+      DMDisplayPtr display = DMDisplayPtr(new DMDisplay());
+      display->id = displays.size();
+      display->name = out->name;
+      display->priv_id = o;
+      displays[display->id] = display;
+
+      for (int om = 0; om < out->nmode; om++) {
+        RRMode xm = out->modes[om];
+        for (int n = 0; n < resources->nmode; n++) {
+          XRRModeInfo m = resources->modes[n];
+          if (m.id != xm)
+            continue;
+
+          DMVideoModePtr mode = DMVideoModePtr(new DMVideoMode());
+          mode->priv_id = n;
+          mode->id = display->videoModes.size();
+          display->videoModes[mode->id] = mode;
+
+          mode->interlaced = m.modeFlags & RR_Interlace;
+
+          double vTotal = m.vTotal;
+          if (m.modeFlags & RR_DoubleScan)
+            vTotal *= 2;
+          if (m.modeFlags & RR_Interlace)
+            vTotal /= 2;
+          mode->refreshRate = m.dotClock / (m.hTotal * vTotal);
+
+          mode->width = m.width;
+          mode->height = m.height;
+          mode->bitsPerPixel = 0; // we can't know; depth is not managed by xrandr
+        }
+      }
+    }
+  next:
+    if (crtc)
+      XRRFreeCrtcInfo(crtc);
+    if (out)
+      XRRFreeOutputInfo(out);
+  }
+
+  if (displays.empty())
+    return false;
+  else
+    return DisplayManager::initialize();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool DisplayManagerX11::setDisplayMode(int display, int mode)
+{
+  if (!isValidDisplayMode(display, mode) || !resources)
+    return false;
+
+  DMDisplayPtr displayptr = displays[display];
+  DMVideoModePtr videomode = displayptr->videoModes[mode];
+
+  RROutput output = resources->outputs[displayptr->priv_id];
+  RRMode xrmode = resources->modes[videomode->priv_id].id;
+
+  bool success = false;
+  XRRCrtcInfo *crtc = NULL;
+  XRROutputInfo *out = XRRGetOutputInfo(xdisplay, resources, output);
+  if (!out || !out->crtc)
+    goto done;
+  crtc = XRRGetCrtcInfo(xdisplay, resources, out->crtc);
+  if (!crtc)
+    goto done;
+
+  // Keep all information, except the mode.
+  success = XRRSetCrtcConfig(xdisplay, resources, out->crtc, crtc->timestamp,
+                             crtc->x, crtc->y, xrmode, crtc->rotation,
+                             crtc->outputs, crtc->noutput);
+
+done:
+  if (crtc)
+    XRRFreeCrtcInfo(crtc);
+  if (out)
+    XRRFreeOutputInfo(out);
+
+  return success;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerX11::getCurrentDisplayMode(int display)
+{
+  if (!isValidDisplay(display) || !resources)
+    return -1;
+
+  DMDisplayPtr displayptr = displays[display];
+  RROutput output = resources->outputs[displayptr->priv_id];
+
+  int videomode_id = -1;
+  XRRCrtcInfo *crtc = NULL;
+  XRROutputInfo *out = XRRGetOutputInfo(xdisplay, resources, output);
+  if (!out || !out->crtc)
+    goto done;
+  crtc = XRRGetCrtcInfo(xdisplay, resources, out->crtc);
+  if (!crtc)
+    goto done;
+
+  foreach (DMVideoModePtr mode, displayptr->videoModes)
+  {
+    XRRModeInfo m = resources->modes[mode->priv_id];
+    if (crtc->mode == m.id)
+    {
+      videomode_id = mode->id;
+      break;
+    }
+  }
+
+done:
+  if (crtc)
+    XRRFreeCrtcInfo(crtc);
+  if (out)
+    XRRFreeOutputInfo(out);
+
+  return videomode_id;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerX11::getMainDisplay()
+{
+  // This is probably not what DisplayManager means.
+  RROutput main = XRRGetOutputPrimary(xdisplay, RootWindow(xdisplay, DefaultScreen(xdisplay)));
+  if (!main || !resources)
+    return -1;
+
+  for (int o = 0; o < resources->noutput; o++)
+  {
+    if (main == resources->outputs[o])
+    {
+      for (int displayid = 0; displayid < displays.size(); displayid++)
+      {
+        if (displays[displayid]->priv_id == o)
+          return displayid;
+      }
+      break;
+    }
+  }
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int DisplayManagerX11::getDisplayFromPoint(int x, int y)
+{
+  for (int displayid = 0; displayid < displays.size(); displayid++)
+  {
+    RROutput output = resources->outputs[displays[displayid]->priv_id];
+    XRRCrtcInfo *crtc = NULL;
+    XRROutputInfo *out = XRRGetOutputInfo(xdisplay, resources, output);
+    bool matches = false;
+    if (!out || !out->crtc)
+      goto done;
+    crtc = XRRGetCrtcInfo(xdisplay, resources, out->crtc);
+    if (!crtc)
+      goto done;
+
+    matches = x >= crtc->x && y >= crtc->y &&
+              x < crtc->x + crtc->width &&
+              y < crtc->y + crtc->height;
+
+  done:
+    if (crtc)
+      XRRFreeCrtcInfo(crtc);
+    if (out)
+      XRRFreeOutputInfo(out);
+
+    if (matches)
+      return displayid;
+  }
+
+  return -1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+DisplayManagerX11::~DisplayManagerX11()
+{
+  if (resources)
+    XRRFreeScreenResources(resources);
+  if (xdisplay)
+    XCloseDisplay(xdisplay);
+}
diff --git a/src/display/x11/DisplayManagerX11.h b/src/display/x11/DisplayManagerX11.h
new file mode 100644
index 0000000..df59096
--- /dev/null
+++ b/src/display/x11/DisplayManagerX11.h
@@ -0,0 +1,33 @@
+#ifndef DISPLAYMANAGERX11_H_
+#define DISPLAYMANAGERX11_H_
+
+#include <qmetatype.h>
+
+#include <X11/extensions/Xrandr.h>
+
+// X11 headers are messing up things for us
+#undef CursorShape
+#undef Bool
+#undef Status
+
+#include "display/DisplayManager.h"
+
+class DisplayManagerX11 : public DisplayManager
+{
+  Q_OBJECT
+private:
+  Display* xdisplay;
+  XRRScreenResources* resources;
+
+public:
+  DisplayManagerX11(QObject* parent) : DisplayManager(parent), xdisplay(0), resources(0) {};
+  virtual ~DisplayManagerX11();
+
+  virtual bool initialize();
+  virtual bool setDisplayMode(int display, int mode);
+  virtual int getCurrentDisplayMode(int display);
+  virtual int getMainDisplay();
+  virtual int getDisplayFromPoint(int x, int y);
+};
+
+#endif /* DISPLAYMANAGERX11_H_ */
diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt
new file mode 100644
index 0000000..3143be5
--- /dev/null
+++ b/src/input/CMakeLists.txt
@@ -0,0 +1,28 @@
+set(INPUT_SRCS
+  InputComponent.cpp
+  InputComponent.h
+  InputMapping.cpp
+  InputMapping.h
+  InputKeyboard.h
+  InputSocket.h
+  InputSocket.cpp
+)
+
+if(APPLE)
+  add_subdirectory(apple)
+endif(APPLE)
+
+if(SDL2_FOUND)
+  list(APPEND INPUT_SRCS InputSDL.cpp InputSDL.h)
+endif(SDL2_FOUND)
+
+if(ENABLE_LIRC)
+  list(APPEND INPUT_SRCS InputLIRC.cpp InputLIRC.h)
+endif(ENABLE_LIRC)
+
+if(CEC_FOUND)
+  list(APPEND INPUT_SRCS InputCEC.cpp InputCEC.h)
+endif(CEC_FOUND)
+
+add_sources(${INPUT_SRCS})
+
diff --git a/src/input/InputCEC.cpp b/src/input/InputCEC.cpp
new file mode 100644
index 0000000..7dd5758
--- /dev/null
+++ b/src/input/InputCEC.cpp
@@ -0,0 +1,361 @@
+
+#include "QsLog.h"
+#include "InputCEC.h"
+#include "settings/SettingsComponent.h"
+
+static QMap<int, QString> cecKeyMap   { \
+                                      { CEC_USER_CONTROL_CODE_SELECT , INPUT_KEY_SELECT } , \
+                                      { CEC_USER_CONTROL_CODE_UP , INPUT_KEY_UP } , \
+                                      { CEC_USER_CONTROL_CODE_DOWN , INPUT_KEY_DOWN } , \
+                                      { CEC_USER_CONTROL_CODE_LEFT , INPUT_KEY_LEFT } , \
+                                      { CEC_USER_CONTROL_CODE_RIGHT , INPUT_KEY_RIGHT } , \
+                                      { CEC_USER_CONTROL_CODE_SETUP_MENU , INPUT_KEY_MENU } , \
+                                      { CEC_USER_CONTROL_CODE_PLAY , INPUT_KEY_PLAY } , \
+                                      { CEC_USER_CONTROL_CODE_PAUSE , INPUT_KEY_PAUSE } , \
+                                      { CEC_USER_CONTROL_CODE_STOP , INPUT_KEY_STOP } , \
+                                      { CEC_USER_CONTROL_CODE_EXIT , INPUT_KEY_BACK } , \
+                                      { CEC_USER_CONTROL_CODE_FAST_FORWARD , INPUT_KEY_SEEKFWD } , \
+                                      { CEC_USER_CONTROL_CODE_REWIND , INPUT_KEY_SEEKBCK } , \
+                                      { CEC_USER_CONTROL_CODE_DISPLAY_INFORMATION , INPUT_KEY_INFO } , \
+                                      { CEC_USER_CONTROL_CODE_FORWARD , INPUT_KEY_NEXT } , \
+                                      { CEC_USER_CONTROL_CODE_BACKWARD , INPUT_KEY_PREV } , \
+                                      { CEC_USER_CONTROL_CODE_F1_BLUE , INPUT_KEY_BLUE } , \
+                                      { CEC_USER_CONTROL_CODE_F2_RED , INPUT_KEY_RED } , \
+                                      { CEC_USER_CONTROL_CODE_F3_GREEN , INPUT_KEY_GREEN } , \
+                                      { CEC_USER_CONTROL_CODE_F4_YELLOW , INPUT_KEY_YELLOW } , \
+                                      { CEC_USER_CONTROL_CODE_SUB_PICTURE, INPUT_KEY_SUBTITLES } , \
+                                      { CEC_USER_CONTROL_CODE_ROOT_MENU, INPUT_KEY_HOME }, \
+                                      { CEC_USER_CONTROL_CODE_NUMBER0, INPUT_KEY_0 } ,  \
+                                      { CEC_USER_CONTROL_CODE_NUMBER1, INPUT_KEY_1 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER2, INPUT_KEY_2 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER3, INPUT_KEY_3 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER4, INPUT_KEY_4 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER5, INPUT_KEY_5 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER6, INPUT_KEY_6 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER7, INPUT_KEY_7 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER8, INPUT_KEY_8 } , \
+                                      { CEC_USER_CONTROL_CODE_NUMBER9, INPUT_KEY_9 } , \
+                                      { CEC_USER_CONTROL_CODE_ELECTRONIC_PROGRAM_GUIDE, INPUT_KEY_GUIDE } , \
+                                      };
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+InputCEC::InputCEC(QObject *parent) : InputBase(parent)
+{
+  m_configuration.Clear();
+  m_callbacks.Clear();
+  m_adapter = NULL;
+  m_verboseLogging = false;
+
+  // setup adapter check timer
+  m_timer.setInterval(1000);
+  m_timer.setSingleShot(false);
+  connect(&m_timer, &QTimer::timeout, this, &InputCEC::checkAdapter);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputCEC::initInput()
+{
+  m_configuration.Clear();
+  m_callbacks.Clear();
+
+  m_verboseLogging = SettingsComponent::Get().value(SETTINGS_SECTION_CEC, "verbose_logging").toBool();
+
+  m_configuration.clientVersion = LIBCEC_VERSION_CURRENT;
+  strcpy(m_configuration.strDeviceName, "PlexMPlayer");
+  m_configuration.bActivateSource = 0;
+  m_callbacks.CBCecLogMessage = &CecLogMessage;
+  m_callbacks.CBCecKeyPress = &CecKeyPress;
+  m_callbacks.CBCecCommand = &CecCommand;
+  m_callbacks.CBCecAlert = &CecAlert;
+  m_configuration.callbackParam = this;
+  m_configuration.callbacks = &m_callbacks;
+  m_configuration.deviceTypes.Add(CEC_DEVICE_TYPE_RECORDING_DEVICE);
+  m_configuration.bAutodetectAddress =  CEC_DEFAULT_SETTING_AUTODETECT_ADDRESS;
+  m_configuration.iPhysicalAddress = CEC_PHYSICAL_ADDRESS_TV;
+  m_configuration.baseDevice = CECDEVICE_AUDIOSYSTEM;
+  m_configuration.bActivateSource = 1;
+
+  m_configuration.iHDMIPort = (quint8)SettingsComponent::Get().value(SETTINGS_SECTION_CEC, "hdmiport").toInt();
+
+  // open libcec
+  m_adapter = (ICECAdapter*)CECInitialise(&m_configuration);
+  if (!m_adapter)
+  {
+    QLOG_ERROR() << "Unable to initialize libCEC.";
+    return false;
+  }
+
+  QLOG_INFO() << "libCEC was successfully initialized, found version"
+              << m_configuration.serverVersion;
+
+  // init video on targets that need this
+  m_adapter->InitVideoStandalone();
+
+  // start the adapter check timer
+  m_timer.start();
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+InputCEC::~InputCEC()
+{
+  m_timer.stop();
+  close();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+void InputCEC::close()
+{
+  if (m_adapter)
+  {
+    QLOG_DEBUG() << "Closing libCEC.";
+    closeAdapter();
+    CECDestroy(m_adapter);
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputCEC::openAdapter()
+{
+  bool ret = false;
+  m_lock.lock();
+
+  // try to find devices
+  cec_adapter devices[10];
+  int devicesCount = m_adapter->FindAdapters(devices, 10, NULL);
+  if (devicesCount > 0)
+  {
+    // list devices
+    QLOG_INFO() << "libCEC found" << devicesCount << "CEC adapters.";
+
+    // open first adapter
+    m_adapterPort = devices[0].comm;
+    if (m_adapter->Open(m_adapterPort.toStdString().c_str()))
+    {
+      QLOG_INFO() << "Device " << devices[0].path << "was successfully openned";
+      ret = true;
+    }
+    else
+    {
+      QLOG_ERROR() << "Opening device" << devices[0].path << "failed";
+      ret = false;
+    }
+  }
+
+  m_lock.unlock();
+  return ret;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+void InputCEC::closeAdapter()
+{
+  m_lock.lock();
+
+  if (m_adapter)
+    m_adapter->Close();
+
+  m_adapterPort = "";
+  m_lock.unlock();
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+void InputCEC::reopenAdapter()
+{
+  closeAdapter();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputCEC::checkAdapter()
+{
+  if (m_adapterPort.isEmpty())
+  {
+    openAdapter();
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputCEC::sendReceivedInput(const QString &source, const QString &keycode, float amount)
+{
+  emit receivedInput(source, keycode, amount);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString InputCEC::getCommandString(cec_user_control_code code, unsigned int duration)
+{
+  QString key = cecKeyMap[code];
+
+  if (!key.isEmpty() && (duration > CEC_LONGPRESS_DURATION))
+  {
+    key += "_LONG";
+  }
+
+  return key;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int InputCEC::CecLogMessage(void* cbParam, const cec_log_message message)
+{
+  InputCEC *cec = (InputCEC*)cbParam;
+  switch (message.level)
+  {
+    case CEC_LOG_ERROR:
+      QLOG_ERROR() << "libCEC ERROR:" << message.message;
+      break;
+
+    case CEC_LOG_WARNING:
+      QLOG_WARN() << "libCEC WARNING:" << message.message;
+      break;
+
+    case CEC_LOG_NOTICE:
+      QLOG_INFO() << "libCEC NOTICE:" << message.message;
+      break;
+
+    case CEC_LOG_DEBUG:
+      if (cec->m_verboseLogging)
+      {
+        QLOG_DEBUG() << "libCEC DEBUG:" << message.message;
+      }
+      break;
+
+    case CEC_LOG_TRAFFIC:
+      break;
+
+    default:
+      break;
+  }
+
+  return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int InputCEC::CecKeyPress(void *cbParam, const cec_keypress key)
+{
+  InputCEC *cec = (InputCEC*)cbParam;
+  if (cec && key.duration == 0)
+  {
+    QString cmdString = cec->getCommandString(key.keycode, key.duration);
+
+    if (!cmdString.isEmpty())
+      cec->sendReceivedInput(CEC_INPUT_NAME, cmdString);
+  }
+
+  return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int InputCEC::CecCommand(void *cbParam, const cec_command command)
+{
+  InputCEC *cec = (InputCEC*)cbParam;
+
+  switch(command.opcode)
+  {
+    case CEC_OPCODE_PLAY:
+      cec->sendReceivedInput(CEC_INPUT_NAME, INPUT_KEY_PLAY);
+      break;
+
+    case CEC_OPCODE_DECK_CONTROL:
+      if (command.parameters.size)
+      {
+        switch(command.parameters[0])
+        {
+          case CEC_DECK_CONTROL_MODE_SKIP_FORWARD_WIND:
+            cec->sendReceivedInput(CEC_INPUT_NAME, INPUT_KEY_SEEKFWD);
+            break;
+
+          case CEC_DECK_CONTROL_MODE_SKIP_REVERSE_REWIND:
+            cec->sendReceivedInput(CEC_INPUT_NAME, INPUT_KEY_SEEKBCK);
+            break;
+
+          case CEC_DECK_CONTROL_MODE_STOP:
+            cec->sendReceivedInput(CEC_INPUT_NAME, INPUT_KEY_STOP);
+            break;
+
+          default:
+            break;
+        }
+      }
+      break;
+
+    case CEC_OPCODE_VENDOR_REMOTE_BUTTON_DOWN:
+      if (command.parameters.size)
+      {
+        switch(command.parameters[0])
+        {
+          // samsung Return key
+          case CEC_USER_CONTROL_CODE_AN_RETURN:
+            cec->sendReceivedInput(CEC_INPUT_NAME, INPUT_KEY_BACK);
+            break;
+
+          default:
+            break;
+        }
+      }
+      break;
+
+    case CEC_OPCODE_VENDOR_REMOTE_BUTTON_UP:
+    case CEC_OPCODE_USER_CONTROL_PRESSED:
+      // ignore those commands as they are handled in CecKeypress
+      break;
+
+    case CEC_OPCODE_GIVE_OSD_NAME:
+    case CEC_OPCODE_GIVE_PHYSICAL_ADDRESS:
+      // ignore those known commands (only pollng from TV)
+      break;
+
+    default:
+      QLOG_DEBUG() << "Unhandled CEC command " << command.opcode;
+      if (command.parameters.size)
+      {
+        for (int i=0; i<command.parameters.size; i++)
+          QLOG_DEBUG() << command.parameters.size << QString("parameters -> [%1]= %2").arg(i).arg(command.parameters[i]);
+      }
+      break;
+  }
+
+  return 1;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+int InputCEC::CecAlert(void *cbParam, const libcec_alert type, const libcec_parameter param)
+{
+  bool reopen = false;
+
+  switch (type)
+  {
+    case CEC_ALERT_SERVICE_DEVICE:
+      QLOG_ERROR() << "libCEC : Alert CEC_ALERT_SERVICE_DEVICE";
+      break;
+
+    case CEC_ALERT_CONNECTION_LOST:
+      QLOG_ERROR() << "libCEC : Alert CEC_ALERT_CONNECTION_LOST";
+      break;
+
+    case CEC_ALERT_PERMISSION_ERROR:
+      QLOG_ERROR() << "libCEC : Alert CEC_ALERT_PERMISSION_ERROR";
+      reopen = true;
+      break;
+
+    case CEC_ALERT_PORT_BUSY:
+      QLOG_ERROR() << "libCEC : Alert CEC_ALERT_PORT_BUSY";
+      reopen = true;
+      break;
+
+    default:
+      break;
+  }
+
+  if (reopen)
+  {
+    QLOG_DEBUG() << "libCEC : Reopenning adapter";
+    InputCEC *cec = (InputCEC*)cbParam;
+    if (cec)
+      cec->reopenAdapter();
+  }
+
+  return 0;
+}
+
+
+
+
+
diff --git a/src/input/InputCEC.h b/src/input/InputCEC.h
new file mode 100644
index 0000000..f608962
--- /dev/null
+++ b/src/input/InputCEC.h
@@ -0,0 +1,55 @@
+#ifndef INPUTCEC_H
+#define INPUTCEC_H
+
+#include <QMutex>
+#include <QTimer>
+#include "input/InputComponent.h"
+#include <cec.h>
+
+using namespace CEC;
+
+#define CEC_LONGPRESS_DURATION 1000  // duration after keypress is considerered as long
+
+#define CEC_INPUT_NAME "CEC"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class InputCEC : public InputBase
+{
+public:
+  InputCEC(QObject* parent);
+  ~InputCEC();
+
+  virtual const char* inputName() { return CEC_INPUT_NAME; }
+  virtual bool initInput();
+  void close();
+
+private:
+  libcec_configuration m_configuration;
+  ICECCallbacks m_callbacks;
+  ICECAdapter*  m_adapter;
+  QString m_adapterPort;
+  QMutex m_lock;
+  QTimer m_timer;
+  bool m_verboseLogging;
+
+  bool openAdapter();
+  void closeAdapter();
+  QString getCommandString(cec_user_control_code code, unsigned int duration);
+  void sendReceivedInput(const QString& source, const QString& keycode, float amount = 1.0);
+
+
+  // libcec callbacks
+  static int CecLogMessage(void *cbParam, const cec_log_message message);
+  static int CecKeyPress(void *cbParam, const cec_keypress key);
+  static int CecCommand(void *cbParam, const cec_command command);
+  static int CecAlert(void *cbParam, const libcec_alert type, const libcec_parameter param);
+
+public:
+  void reopenAdapter();
+
+public slots:
+  void checkAdapter();
+
+};
+
+#endif // INPUTCEC_H
diff --git a/src/input/InputComponent.cpp b/src/input/InputComponent.cpp
new file mode 100644
index 0000000..4eddcc1
--- /dev/null
+++ b/src/input/InputComponent.cpp
@@ -0,0 +1,104 @@
+
+#include "QsLog.h"
+#include "InputComponent.h"
+#include "settings/SettingsComponent.h"
+#include "system/SystemComponent.h"
+#include "power/PowerComponent.h"
+#include "InputKeyboard.h"
+#include "InputSocket.h"
+
+#ifdef Q_OS_MAC
+#include "apple/InputAppleRemote.h"
+#include "apple/InputAppleMediaKeys.h"
+#endif
+
+#ifdef HAVE_SDL
+#include "InputSDL.h"
+#endif
+
+#ifdef HAVE_LIRC
+#include "InputLIRC.h"
+#endif
+
+#ifdef HAVE_CEC
+#include "InputCEC.h"
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+InputComponent::InputComponent(QObject* parent) : ComponentBase(parent)
+{
+  m_mappings = new InputMapping(this);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputComponent::addInput(InputBase* base)
+{
+  if (!base->initInput())
+  {
+    QLOG_WARN() << "Failed to init input:" << base->inputName();
+    return false;
+  }
+  
+  QLOG_INFO() << "Successfully inited input:" << base->inputName();
+  m_inputs.push_back(base);
+
+  // we connect to the provider receivedInput signal, then we check if the name
+  // needs to be remaped in remapInput and then finally send it out to JS land.
+  //
+  connect(base, &InputBase::receivedInput, this, &InputComponent::remapInput);
+  
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputComponent::componentInitialize()
+{
+  // load our input mappings
+  m_mappings->loadMappings();
+
+  addInput(&InputKeyboard::Get());
+  addInput(new InputSocket(this));
+
+#ifdef Q_OS_MAC
+  addInput(new InputAppleRemote(this));
+  addInput(new InputAppleMediaKeys(this));
+#endif
+#ifdef HAVE_SDL
+  addInput(new InputSDL(this));
+#endif
+#ifdef HAVE_LIRC
+  addInput(new InputLIRC(this));
+#endif
+#ifdef HAVE_CEC
+  if (SettingsComponent::Get().value(SETTINGS_SECTION_CEC, "enable").toBool())
+    addInput(new InputCEC(this));
+#endif
+
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputComponent::remapInput(const QString &source, const QString &keycode, float amount)
+{
+  // hide mouse if it's visible.
+  SystemComponent::Get().setCursorVisibility(false);
+
+  QString action = m_mappings->mapToAction(source, keycode);
+  if (!action.isEmpty())
+  {
+    if (action.startsWith("host:"))
+    {
+      QLOG_DEBUG() << "Handling host command:" << action.mid(5);
+      emit receivedHostCommand(action.mid(5));
+    }
+    else
+    {
+      QLOG_DEBUG() << "Sending action:" << action;
+      emit receivedAction(action);
+    }
+  }
+  else
+  {
+    QLOG_WARN() << "Could not map:" << source << keycode << "to any useful action";
+  }
+}
diff --git a/src/input/InputComponent.h b/src/input/InputComponent.h
new file mode 100644
index 0000000..e2869a0
--- /dev/null
+++ b/src/input/InputComponent.h
@@ -0,0 +1,94 @@
+#ifndef INPUTADAPTER_H
+#define INPUTADAPTER_H
+
+#include <QThread>
+#include <QVariantMap>
+#include "ComponentManager.h"
+#include "InputMapping.h"
+
+class InputBase : public QObject
+{
+  Q_OBJECT
+public:
+  InputBase(QObject* parent = 0) : QObject(parent) { }
+  virtual bool initInput() = 0;
+  virtual const char* inputName() = 0;
+  
+signals:
+  void receivedInput(const QString& source, const QString& keycode, float amount = 1.0);
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// well known keys
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+#define INPUT_KEY_LEFT      "KEY_LEFT"
+#define INPUT_KEY_RIGHT     "KEY_RIGHT"
+#define INPUT_KEY_UP        "KEY_UP"
+#define INPUT_KEY_DOWN      "KEY_DOWN"
+#define INPUT_KEY_SELECT    "KEY_SELECT"
+#define INPUT_KEY_MENU      "KEY_MENU"
+#define INPUT_KEY_PLAY      "KEY_PLAY"
+#define INPUT_KEY_PAUSE     "KEY_PAUSE"
+#define INPUT_KEY_STOP      "KEY_STOP"
+#define INPUT_KEY_DOWN      "KEY_DOWN"
+#define INPUT_KEY_BACK      "KEY_BACK"
+#define INPUT_KEY_SEEKFWD   "KEY_SEEKFWD"
+#define INPUT_KEY_SEEKBCK   "KEY_SEEKBCK"
+#define INPUT_KEY_SUBTITLES "KEY_SUBTITLES"
+#define INPUT_KEY_INFO      "KEY_INFO"
+#define INPUT_KEY_NEXT      "KEY_NEXT"
+#define INPUT_KEY_PREV      "KEY_PREV"
+#define INPUT_KEY_RED       "KEY_RED"
+#define INPUT_KEY_GREEN     "KEY_GREEN"
+#define INPUT_KEY_BLUE      "KEY_BLUE"
+#define INPUT_KEY_YELLOW    "KEY_YELLOW"
+#define INPUT_KEY_HOME      "KEY_HOME"
+#define INPUT_KEY_0         "KEY_NUMERIC_0"
+#define INPUT_KEY_1         "KEY_NUMERIC_1"
+#define INPUT_KEY_2         "KEY_NUMERIC_2"
+#define INPUT_KEY_3         "KEY_NUMERIC_3"
+#define INPUT_KEY_4         "KEY_NUMERIC_4"
+#define INPUT_KEY_5         "KEY_NUMERIC_5"
+#define INPUT_KEY_6         "KEY_NUMERIC_6"
+#define INPUT_KEY_7         "KEY_NUMERIC_7"
+#define INPUT_KEY_8         "KEY_NUMERIC_8"
+#define INPUT_KEY_9         "KEY_NUMERIC_9"
+#define INPUT_KEY_GUIDE     "KEY_GUIDE"
+
+#define INPUT_KEY_LEFT_LONG    "KEY_LEFT_LONG"
+#define INPUT_KEY_RIGHT_LONG   "KEY_RIGHT_LONG"
+#define INPUT_KEY_UP_LONG      "KEY_UP_LONG"
+#define INPUT_KEY_DOWN_LONG    "KEY_DOWN_LONG"
+#define INPUT_KEY_SELECT_LONG  "KEY_SELECT_LONG"
+#define INPUT_KEY_MENU_LONG    "KEY_MENU_LONG"
+#define INPUT_KEY_PLAY_LONG    "KEY_PLAY_LONG"
+#define INPUT_KEY_DOWN_LONG    "KEY_DOWN_LONG"
+
+
+class InputComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(InputComponent);
+
+public:
+  virtual const char* componentName() { return "input"; }
+  virtual bool componentExport() { return true; }
+  virtual bool componentInitialize();
+
+signals:
+  void receivedAction(const QString& action);
+  void receivedHostCommand(const QString& hostCommand);
+
+private Q_SLOTS:
+  void remapInput(const QString& source, const QString& keycode, float amount = 1.0);
+  
+private:
+  InputComponent(QObject *parent = 0);
+  bool addInput(InputBase* input);
+
+  QList<InputBase*> m_inputs;
+  InputMapping* m_mappings;
+};
+
+#endif // INPUTADAPTER_H
diff --git a/src/input/InputKeyboard.h b/src/input/InputKeyboard.h
new file mode 100644
index 0000000..b39764e
--- /dev/null
+++ b/src/input/InputKeyboard.h
@@ -0,0 +1,31 @@
+//
+// Created by Tobias Hieta on 09/06/15.
+//
+
+#ifndef KONVERGO_INPUTKEYBOARD_H
+#define KONVERGO_INPUTKEYBOARD_H
+
+#include <QKeySequence>
+#include "InputComponent.h"
+#include "QsLog.h"
+
+class InputKeyboard : public InputBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(InputKeyboard);
+
+public:
+  virtual bool initInput() { return true; }
+  virtual const char* inputName() { return "Keyboard"; }
+
+  void keyPress(const QKeySequence& sequence)
+  {
+    QLOG_DEBUG() << "Input:" << sequence.toString();
+    emit receivedInput("Keyboard", sequence.toString());
+  }
+
+private:
+  explicit InputKeyboard(QObject* parent = 0) : InputBase(parent) {}
+};
+
+#endif //KONVERGO_INPUTKEYBOARD_H
diff --git a/src/input/InputLIRC.cpp b/src/input/InputLIRC.cpp
new file mode 100644
index 0000000..1fb9b52
--- /dev/null
+++ b/src/input/InputLIRC.cpp
@@ -0,0 +1,116 @@
+
+#include <QGuiApplication>
+#include "QsLog.h"
+#include "InputLIRC.h"
+
+#define DEFAULT_LIRC_ADDRESS "/run/lirc/lircd"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+InputLIRC::InputLIRC(QObject* parent) : InputBase(parent)
+{
+  socket = new QLocalSocket(this);
+  socketNotifier = NULL;
+
+  connect(socket, SIGNAL(error(QLocalSocket::LocalSocketError)), this,
+          SLOT(socketerror(QLocalSocket::LocalSocketError)));
+  connect(socket, SIGNAL(connected()), this, SLOT(connected()));
+  connect(socket, SIGNAL(disconnected()), this, SLOT(disconnected()));
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+InputLIRC::~InputLIRC()
+{
+  if (socket)
+    disconnect();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputLIRC::initInput()
+{
+  return connectToLIRC();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputLIRC::connectToLIRC()
+{
+  disconnect();
+
+  socket->connectToServer(DEFAULT_LIRC_ADDRESS, QIODevice::ReadWrite);
+  if (isConnected())
+  {
+    socketNotifier = new QSocketNotifier(socket->socketDescriptor(), QSocketNotifier::Read, this);
+    connect(socketNotifier, SIGNAL(activated(int)), this, SLOT(read(int)));
+    return true;
+  }
+  else
+    return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputLIRC::disconnectFromLIRC()
+{
+  if (socket)
+    socket->disconnectFromServer();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputLIRC::isConnected()
+{
+  while (socket->state() == QLocalSocket::ConnectingState)
+  {
+    QGuiApplication::processEvents();
+  }
+
+  return (socket->state() == QLocalSocket::ConnectedState);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputLIRC::connected()
+{
+  QLOG_INFO() << "LIRC socket connected ";
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputLIRC::disconnected()
+{
+  QLOG_INFO() << "LIRC socket disconnected ";
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputLIRC::socketerror(QLocalSocket::LocalSocketError socketError)
+{
+  QLOG_ERROR() << "LIRC Socket Error : " << socketError;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputLIRC::read(int handle)
+{
+  QString input;
+
+  while ((input = socket->readLine()) != "")
+  {
+    QStringList cmdList = input.split(' ', QString::KeepEmptyParts);
+    if (cmdList.size() == 4)
+    {
+      // grab the input data
+      QString code = cmdList.at(0);
+      QString repeat = cmdList.at(1);
+      QString command = cmdList.at(2);
+      QString remote = cmdList.at(3);
+
+      int repeatCount = repeat.toInt();
+
+      QLOG_INFO() << "LIRC Got Key : " << command << ", repeat count:" << repeatCount
+                  << ", from remote " << remote;
+
+      // we dont want to have all the IR Bursts when we press a key
+      // it makes GUI unusable
+      if ((repeatCount % 3) == 0)
+      {
+        emit receivedInput("LIRC", command);
+      }
+    }
+    else
+      QLOG_ERROR() << "Unknown LIRC input: " << input;
+  }
+}
diff --git a/src/input/InputLIRC.h b/src/input/InputLIRC.h
new file mode 100644
index 0000000..5e6af4a
--- /dev/null
+++ b/src/input/InputLIRC.h
@@ -0,0 +1,33 @@
+#ifndef INPUTLIRC_H
+#define INPUTLIRC_H
+
+#include <QLocalSocket>
+#include <QSocketNotifier>
+#include "input/InputComponent.h"
+
+class InputLIRC : public InputBase
+{
+  Q_OBJECT
+private:
+  QLocalSocket* socket;
+  QSocketNotifier* socketNotifier;
+
+  bool connectToLIRC();
+  void disconnectFromLIRC();
+  bool isConnected();
+
+public:
+  InputLIRC(QObject* parent);
+  ~InputLIRC();
+
+  virtual const char* inputName() { return "LIRC"; }
+  virtual bool initInput();
+
+private Q_SLOTS:
+  void connected();
+  void disconnected();
+  void socketerror(QLocalSocket::LocalSocketError socketError);
+  void read(int handle);
+};
+
+#endif // INPUTLIRC_H
diff --git a/src/input/InputMapping.cpp b/src/input/InputMapping.cpp
new file mode 100644
index 0000000..a4058bf
--- /dev/null
+++ b/src/input/InputMapping.cpp
@@ -0,0 +1,161 @@
+#include "InputMapping.h"
+#include <QDir>
+#include <QDirIterator>
+#include <QByteArray>
+#include <QFile>
+#include <QJsonArray>
+#include <QJsonObject>
+#include <QJsonDocument>
+
+#include "QsLog.h"
+#include "Paths.h"
+#include "utils/Utils.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+InputMapping::InputMapping(QObject *parent) : QObject(parent)
+{
+  m_watcher = new QFileSystemWatcher(this);
+  connect(m_watcher, &QFileSystemWatcher::directoryChanged, this, &InputMapping::dirChange);
+  connect(m_watcher, &QFileSystemWatcher::fileChanged, this, &InputMapping::dirChange);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputMapping::dirChange()
+{
+  QLOG_INFO() << "Change to user input path, reloading mappings.";
+  loadMappings();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputMapping::loadMappings()
+{
+  m_inputMatcher.clear();
+  m_sourceMatcher.clear();
+
+  // don't watch the path while we potentially copy files to the directory
+  if (m_watcher->directories().size() > 0)
+    m_watcher->removePath(Paths::dataDir("inputmaps"));
+
+  // first we load the bundled mappings
+  loadMappingDirectory(":/inputmaps", true);
+
+  // now we load the user ones, if there are any
+  // they will now overload the built-in ones.
+  //
+  loadMappingDirectory(Paths::dataDir("inputmaps"), false);
+
+  // we want to watch this dir for new files and changed files
+  m_watcher->addPath(Paths::dataDir("inputmaps"));
+
+  emit mappingChanged();
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString InputMapping::mapToAction(const QString& source, const QString& keycode)
+{
+  // if the source is direct we will just use the keycode as the action
+  if (source == "direct")
+    return keycode;
+
+  // first we need to match the source
+  QVariant sourceName = m_sourceMatcher.match(source);
+  if (sourceName.isValid())
+  {
+    QVariant action = m_inputMatcher.value(sourceName.toString())->match(keycode);
+    if (action.isValid())
+    {
+      QLOG_DEBUG() << "Mapped:" << keycode << "to action:" << action.toString();
+      return action.toString();
+    }
+  }
+  return QString();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputMapping::loadMappingFile(const QString& path, QPair<QString, QVariantMap> &mappingPair)
+{
+  QJsonParseError err;
+  auto doc = Utils::OpenJsonDocument(path, &err);
+  if (doc.isNull())
+  {
+    QLOG_WARN() << "Failed to parse input mapping file:" << path << "," << err.errorString();
+    return false;
+  }
+
+  if (doc.isObject())
+  {
+    auto obj = doc.object();
+    if (!obj.contains("name"))
+    {
+      QLOG_WARN() << "Missing elements 'name' from mapping file:" << path;
+      return false;
+    }
+
+    if (!obj.contains("idmatcher"))
+    {
+      QLOG_WARN() << "Missing element 'idmatcher' from mapping file:" << path;
+      return false;
+    }
+
+    if (!obj.contains("mapping"))
+    {
+      QLOG_WARN() << "Missing element 'mapping' from mapping file:" << path;
+      return false;
+    }
+
+    mappingPair = qMakePair(obj["name"].toString(), obj.toVariantMap());
+    return true;
+  }
+
+  QLOG_WARN() << "Wrong format for file:" << path;
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputMapping::loadMappingDirectory(const QString& path, bool copy)
+{
+  QLOG_INFO() << "Loading inputmaps from:" << path;
+  QDirIterator it(path);
+  while (it.hasNext())
+  {
+    QFileInfo finfo = QFileInfo(it.next());
+    if (finfo.isFile() && finfo.isReadable() && finfo.fileName().endsWith(".json"))
+    {
+      // make a copy of the original file to the example directory
+      if (copy)
+      {
+        QDir userdir(Paths::dataDir());
+        userdir.mkpath("inputmaps/examples/");
+        QString examplePath(userdir.filePath("inputmaps/examples/" + finfo.fileName()));
+
+        // make sure we really overwrite the file. copy will not do this.
+        if (QFile(examplePath).exists())
+          QFile::remove(examplePath);
+
+        QFile::copy(finfo.absoluteFilePath(), examplePath);
+        QFile(examplePath).setPermissions(QFileDevice::ReadOwner | QFileDevice::ReadGroup | QFileDevice::WriteOwner |
+                                            QFileDevice::WriteGroup | QFileDevice::ReadOther);
+      }
+
+
+      QPair<QString, QVariantMap> mapping;
+      if (loadMappingFile(finfo.absoluteFilePath(), mapping))
+      {
+        // add the source regexp to the matcher
+        if (m_sourceMatcher.addMatcher(mapping.second.value("idmatcher").toString(), mapping.first))
+        {
+          // get the input map and add it to a new CachedMatcher
+          QVariantMap inputMap = mapping.second.value("mapping").toMap();
+          CachedRegexMatcher* inputMatcher = new CachedRegexMatcher(this);
+          foreach(const QString& pattern, inputMap.keys())
+            inputMatcher->addMatcher("^" + pattern + "$", inputMap.value(pattern));
+
+          m_inputMatcher.insert(mapping.first, inputMatcher);
+        }
+      }
+    }
+  }
+
+  return true;
+}
diff --git a/src/input/InputMapping.h b/src/input/InputMapping.h
new file mode 100644
index 0000000..1bc3caa
--- /dev/null
+++ b/src/input/InputMapping.h
@@ -0,0 +1,37 @@
+#ifndef INPUTMAPPING_H
+#define INPUTMAPPING_H
+
+#include <QMap>
+#include <QObject>
+#include <QFileSystemWatcher>
+#include <QRegExp>
+#include <QVariantMap>
+#include <QMutex>
+#include <utils/CachedRegexMatcher.h>
+
+class InputMapping : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit InputMapping(QObject *parent = 0);
+  bool loadMappings();
+  QString mapToAction(const QString& source, const QString& keycode);
+
+private Q_SLOTS:
+  void dirChange();
+
+signals:
+  void mappingChanged();
+
+private:
+  bool loadMappingFile(const QString &path, QPair<QString, QVariantMap> &mappingPair);
+  bool loadMappingDirectory(const QString& path, bool copy);
+
+  QFileSystemWatcher* m_watcher;
+
+  QHash<QString, CachedRegexMatcher*> m_inputMatcher;
+  CachedRegexMatcher m_sourceMatcher;
+};
+
+#endif // INPUTMAPPING_H
diff --git a/src/input/InputSDL.cpp b/src/input/InputSDL.cpp
new file mode 100644
index 0000000..204535a
--- /dev/null
+++ b/src/input/InputSDL.cpp
@@ -0,0 +1,275 @@
+//
+//  InputSDL.cpp
+//  konvergo
+//
+//  Created by Lionel CHAZALLON on 16/10/2014.
+//
+//
+
+#include <QKeyEvent>
+#include "InputSDL.h"
+#include "QsLog.h"
+
+#include <climits>
+#include <cstdlib>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputSDLWorker::initialize()
+{
+  // close if it was previously inited
+  close();
+
+  // init SDL
+  if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+  {
+    QLOG_ERROR() << "SDL failed to initialize : " << SDL_GetError();
+    return false;
+  }
+
+  SDL_JoystickEventState(SDL_ENABLE);
+
+  refreshJoystickList();
+
+  return true;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+void InputSDLWorker::close()
+{
+  if (SDL_WasInit(SDL_INIT_JOYSTICK))
+  {
+    QLOG_INFO() << "SDL is closing.";
+
+    // we need to close all the openned joysticks here and then exit the thread
+    for (int joyid = 0; joyid < m_joysticks.size(); joyid++)
+    {
+      SDL_JoystickClose(m_joysticks[joyid]);
+    }
+
+    SDL_Quit();
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString InputSDLWorker::nameForId(SDL_JoystickID id)
+{
+  if (m_joysticks.contains(id))
+    return SDL_JoystickName(m_joysticks[id]);
+
+  return "unknown joystick";
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputSDLWorker::run()
+{
+  QElapsedTimer polltimer;
+
+  while (true)
+  {
+    SDL_Event event;
+
+    // startpoint for polling loop
+    polltimer.restart();
+
+    while (SDL_PollEvent(&event))
+    {
+      switch (event.type)
+      {
+        case SDL_QUIT:
+          return;
+          break;
+
+        case SDL_JOYBUTTONDOWN:
+        {
+          QLOG_DEBUG() << "SDL Got button down for button #" << event.jbutton.button
+                      << " on Joystick #" << event.jbutton.which;
+          QElapsedTimer* timer = new QElapsedTimer();
+          m_buttonTimestamps[event.jbutton.button] = timer;
+          timer->start();
+          break;
+        }
+
+        case SDL_JOYBUTTONUP:
+        {
+          if (m_buttonTimestamps[event.jbutton.button])
+          {
+            emit receivedInput(nameForId(event.jbutton.which), QString("KEY_BUTTON_%1").arg(event.jbutton.button));
+            delete m_buttonTimestamps[event.jbutton.button];
+            m_buttonTimestamps.remove(event.jbutton.button);
+          }
+
+          break;
+        }
+
+        case SDL_JOYDEVICEADDED:
+        {
+          QLOG_INFO() << "SDL detected device was added.";
+          refreshJoystickList();
+          break;
+        }
+
+        case SDL_JOYDEVICEREMOVED:
+        {
+          QLOG_INFO() << "SDL detected device was removed.";
+          refreshJoystickList();
+          break;
+        }
+
+        case SDL_JOYAXISMOTION:
+        {
+          int deadband = 32768 *0.05;
+
+          // handle the analog value push
+          // keep a dead band of 5%
+          if (std::abs(event.jaxis.value) > deadband)
+          {
+            // normalize the value
+            float normalizedvalue;
+            QString keyname;
+            if (event.jaxis.value > 0)
+            {
+              normalizedvalue = (float)(event.jaxis.value - deadband) / (float)(32767 - deadband);
+              keyname = QString("KEY_AXIS_%1_VAL_UP").arg(event.jaxis.axis);
+            }
+            else
+            {
+              normalizedvalue = (float)(std::abs(event.jaxis.value) - deadband) / (float)(32768 - deadband);
+              keyname = QString("KEY_AXIS_%1_VAL_DOWN").arg(event.jaxis.axis);
+            }
+
+            emit receivedInput(nameForId(event.jaxis.which), keyname, normalizedvalue);
+          }
+
+          // handle the Digital conversion of the analog axis
+          if (std::abs(event.jaxis.value) > 32768 / 2)
+          {
+            if (!m_axisState[event.jaxis.axis])
+            {
+              m_axisState[event.jaxis.axis] = 1;
+
+              if (event.jaxis.value > 0)
+                emit receivedInput(nameForId(event.jaxis.which), QString("KEY_AXIS_%1_UP").arg(event.jaxis.axis));
+              else
+                emit receivedInput(nameForId(event.jaxis.which), QString("KEY_AXIS_%1_DOWN").arg(event.jaxis.axis));
+
+              break;
+            }
+          }
+
+          m_axisState[event.jaxis.axis] = 0;
+          break;
+        }
+      }
+    }
+
+    // check for longpresses
+    SDLTimeStampMapIterator it = m_buttonTimestamps.constBegin();
+    while (it != m_buttonTimestamps.constEnd())
+    {
+      if (it.value())
+      {
+        if (m_buttonTimestamps[it.key()]->elapsed() > SDL_BUTTON_LONGPRESS_DELAY)
+        {
+          QLOG_DEBUG() << "SDL Got button longpress for button #" << event.jbutton.button
+                      << " on Joystick #" << event.jbutton.which;
+          emit receivedInput(nameForId(event.jbutton.which), QString("KEY_BUTTON_%1_LONG").arg(it.key()));
+          delete it.value();
+          m_buttonTimestamps.remove(it.key());
+          it = m_buttonTimestamps.constBegin();
+          continue;
+        }
+      }
+      else
+      {
+        m_buttonTimestamps.remove(it.key());
+        it = m_buttonTimestamps.constBegin();
+        continue;
+      }
+
+      it++;
+    }
+
+    // make the poll time fixed to SDL_POLL_TIME
+    if (polltimer.elapsed() < SDL_POLL_TIME)
+      QThread::msleep(SDL_POLL_TIME - polltimer.elapsed());
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+void InputSDLWorker::refreshJoystickList()
+{
+  // close all openned joysticks
+  SDLJoystickMapIterator it = m_joysticks.constBegin();
+  while (it != m_joysticks.constEnd())
+  {
+    if (SDL_JoystickGetAttached(m_joysticks[it.key()]))
+      SDL_JoystickClose(m_joysticks[it.key()]);
+    it++;
+  }
+
+  m_joysticks.clear();
+  m_buttonTimestamps.clear();
+
+  // list all the joysticks and open them
+  int numJoysticks = SDL_NumJoysticks();
+  QLOG_INFO() << "SDL found " << numJoysticks << " joysticks";
+
+  for (int joyid = 0; joyid < numJoysticks; joyid++)
+  {
+    SDL_Joystick* joystick = SDL_JoystickOpen(joyid);
+
+    if (joystick)
+    {
+      int instanceid = SDL_JoystickInstanceID(joystick);
+      QLOG_INFO() << "JoyStick #" << instanceid << " is " << SDL_JoystickName(joystick) << " with "
+                  << SDL_JoystickNumButtons(joystick) << " buttons and " << SDL_JoystickNumAxes(joystick)
+                  << "axes";
+      m_joysticks[instanceid] = joystick;
+      m_axisState.clear();
+      m_axisState.resize(SDL_JoystickNumAxes(joystick));
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+InputSDL::InputSDL(QObject* parent) : InputBase(parent)
+{
+  m_thread = new QThread(this);
+  m_sdlworker = new InputSDLWorker(NULL);
+  m_sdlworker->moveToThread(m_thread);
+
+  connect(this, &InputSDL::run, m_sdlworker, &InputSDLWorker::run);
+  connect(m_sdlworker, &InputSDLWorker::receivedInput, this, &InputBase::receivedInput);
+  m_thread->start();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+InputSDL::~InputSDL()
+{
+  close();
+  
+  if (m_thread->isRunning())
+  {
+    m_thread->terminate();
+    m_thread->wait();
+  }
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputSDL::initInput()
+{
+  bool retValue;
+  QMetaObject::invokeMethod(m_sdlworker, "initialize", Qt::BlockingQueuedConnection,
+                            Q_RETURN_ARG(bool, retValue));
+
+  if (retValue)
+    emit run();
+
+  return retValue;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+void InputSDL::close()
+{
+  QMetaObject::invokeMethod(m_sdlworker, "close");
+}
diff --git a/src/input/InputSDL.h b/src/input/InputSDL.h
new file mode 100644
index 0000000..9e5eae2
--- /dev/null
+++ b/src/input/InputSDL.h
@@ -0,0 +1,73 @@
+//
+//  InputSDL.h
+//  konvergo
+//
+//  Created by Lionel CHAZALLON on 16/10/2014.
+//
+//
+
+#ifndef _INPUT_SDL_
+#define _INPUT_SDL_
+
+#include <QThread>
+#include <QElapsedTimer>
+#include <QByteArray>
+#include <SDL.h>
+
+#include "input/InputComponent.h"
+
+typedef QMap<int, SDL_Joystick*> SDLJoystickMap;
+typedef SDLJoystickMap::const_iterator SDLJoystickMapIterator;
+
+typedef QMap<int, QElapsedTimer*> SDLTimeStampMap;
+typedef QMap<int, QElapsedTimer*>::const_iterator SDLTimeStampMapIterator;
+
+#define SDL_POLL_TIME 50
+#define SDL_BUTTON_LONGPRESS_DELAY 500
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class InputSDLWorker : public QObject
+{
+  Q_OBJECT
+
+public:
+  InputSDLWorker(QObject* parent) : QObject(parent) {}
+
+public slots:
+  void run();
+  bool initialize();
+  void close();
+
+signals:
+  void receivedInput(const QString& source, const QString& keycode, float amount = 1.0);
+
+private:
+  void refreshJoystickList();
+  QString nameForId(SDL_JoystickID id);
+
+  SDLTimeStampMap m_buttonTimestamps;
+  SDLJoystickMap m_joysticks;
+  QByteArray  m_axisState;
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class InputSDL : public InputBase
+{
+  Q_OBJECT
+public:
+  InputSDL(QObject* parent);
+  ~InputSDL();
+  
+  virtual const char* inputName() { return "SDL"; }
+  virtual bool initInput();
+  
+  void close();
+private:
+  InputSDLWorker* m_sdlworker;
+  QThread* m_thread;
+  
+signals:
+  void run();
+};
+
+#endif /* _INPUT_SDL_ */
diff --git a/src/input/InputSocket.cpp b/src/input/InputSocket.cpp
new file mode 100644
index 0000000..073ed51
--- /dev/null
+++ b/src/input/InputSocket.cpp
@@ -0,0 +1,42 @@
+//
+// Created by Tobias Hieta on 24/08/15.
+//
+
+#include "InputSocket.h"
+#include "QsLog.h"
+#include "Version.h"
+
+#include <QDataStream>
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool InputSocket::initInput()
+{
+  return m_server->listen();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void InputSocket::clientConnected(QLocalSocket* socket)
+{
+  QVariantMap welcome;
+  welcome.insert("version", Version::GetVersionString());
+  welcome.insert("builddate", Version::GetBuildDate());
+
+  m_server->sendMessage(welcome, socket);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void InputSocket::messageReceived(const QVariant& message)
+{
+  QVariantMap map = message.toMap();
+
+  if (!map.contains("client") || !map.contains("source") || !map.contains("keycode"))
+  {
+    QLOG_WARN() << "Got packet from client but it was missing the important fields";
+    return;
+  }
+
+  QLOG_DEBUG() << "Input from client:" << map.value("client").toString() << " - " <<
+               map.value("source").toString() << map.value("keycode").toString();
+
+  emit receivedInput(map.value("source").toString(), map.value("keycode").toString(), 1);
+}
diff --git a/src/input/InputSocket.h b/src/input/InputSocket.h
new file mode 100644
index 0000000..f05ebd9
--- /dev/null
+++ b/src/input/InputSocket.h
@@ -0,0 +1,33 @@
+//
+// Created by Tobias Hieta on 24/08/15.
+//
+
+#ifndef KONVERGO_INPUTSOCKET_H
+#define KONVERGO_INPUTSOCKET_H
+
+#include "LocalJsonServer.h"
+#include "InputComponent.h"
+
+class InputSocket : public InputBase
+{
+  Q_OBJECT
+public:
+  explicit InputSocket(QObject* parent = 0) : InputBase(parent)
+  {
+    m_server = new LocalJsonServer("inputSocket");
+    connect(m_server, &LocalJsonServer::clientConnected, this, &InputSocket::clientConnected);
+    connect(m_server, &LocalJsonServer::messageReceived, this, &InputSocket::messageReceived);
+  }
+
+  virtual bool initInput() override;
+  virtual const char* inputName() override { return "socket"; };
+
+private Q_SLOTS:
+  void clientConnected(QLocalSocket* socket);
+  void messageReceived(const QVariant& message);
+
+private:
+  LocalJsonServer* m_server;
+};
+
+#endif //KONVERGO_INPUTSOCKET_H
diff --git a/src/input/apple/AppleRemoteDelegate.h b/src/input/apple/AppleRemoteDelegate.h
new file mode 100644
index 0000000..71c5699
--- /dev/null
+++ b/src/input/apple/AppleRemoteDelegate.h
@@ -0,0 +1,29 @@
+#ifndef __APPLE_REMOTE_DELEGATE_H__
+#define __APPLE_REMOTE_DELEGATE_H__
+
+#import <Cocoa/Cocoa.h>
+#import "HIDRemote/HIDRemote.h"
+
+class InputAppleRemote;
+
+@interface AppleRemoteDelegate : NSObject<HIDRemoteDelegate>
+{
+  InputAppleRemote* m_remoteHandler;
+}
+
+- (instancetype)initWithRemoteHandler:(InputAppleRemote*)remoteHandler;
+
+- (void)hidRemote:(HIDRemote *)hidRemote
+  eventWithButton:(HIDRemoteButtonCode)buttonCode
+        isPressed:(BOOL)isPressed
+fromHardwareWithAttributes:(NSMutableDictionary *)attributes;
+
+- (void)hidRemote:(HIDRemote *)hidRemote failedNewHardwareWithError:(NSError *)error;
+- (void)hidRemote:(HIDRemote *)hidRemote foundNewHardwareWithAttributes:(NSMutableDictionary *)attributes;
+- (void)hidRemote:(HIDRemote *)hidRemote releasedHardwareWithAttributes:(NSMutableDictionary *)attributes;
+
+- (bool)setupRemote;
+
+@end
+
+#endif
\ No newline at end of file
diff --git a/src/input/apple/AppleRemoteDelegate.mm b/src/input/apple/AppleRemoteDelegate.mm
new file mode 100644
index 0000000..9afbcea
--- /dev/null
+++ b/src/input/apple/AppleRemoteDelegate.mm
@@ -0,0 +1,68 @@
+#import "AppleRemoteDelegate.h"
+#import "InputAppleRemote.h"
+
+#include "QsLog.h"
+
+@implementation AppleRemoteDelegate
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (instancetype)initWithRemoteHandler: (InputAppleRemote*)remoteHandler
+{
+  self = [super init];
+  if (self) {
+    m_remoteHandler = remoteHandler;
+  }
+  return self;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (bool)setupRemote
+{
+  [[HIDRemote sharedHIDRemote] setDelegate:self];
+  [[HIDRemote sharedHIDRemote] setSimulateHoldEvents:false];
+  if (![[HIDRemote sharedHIDRemote] startRemoteControl:kHIDRemoteModeExclusiveAuto])
+  {
+    QLOG_ERROR() << "Failed to init AppleRemote";
+    return false;
+  }
+  
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (QString)remoteNameFromAttributes:(NSMutableDictionary*)attributes
+{
+  NSString* product = [attributes objectForKey:kHIDRemoteProduct];
+  NSString* manufacturer = [attributes objectForKey:kHIDRemoteManufacturer];
+  
+  return QString("%1-%2").arg([manufacturer UTF8String]).arg([product UTF8String]);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)hidRemote:(HIDRemote *)hidRemote
+  eventWithButton:(HIDRemoteButtonCode)buttonCode
+        isPressed:(BOOL)isPressed
+fromHardwareWithAttributes:(NSMutableDictionary *)attributes
+{
+  m_remoteHandler->remoteButtonEvent(buttonCode, isPressed, [self remoteNameFromAttributes:attributes]);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void)hidRemote:(HIDRemote *)hidRemote foundNewHardwareWithAttributes:(NSMutableDictionary *)attributes
+{
+  m_remoteHandler->addRemote([self remoteNameFromAttributes:attributes]);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void) hidRemote:(HIDRemote *)hidRemote releasedHardwareWithAttributes:(NSMutableDictionary *)attributes
+{
+  m_remoteHandler->removeRemote([self remoteNameFromAttributes:attributes]);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (void) hidRemote:(HIDRemote *)hidRemote failedNewHardwareWithError:(NSError *)error
+{
+  m_remoteHandler->addRemoteFailed(QString([[error localizedDescription] UTF8String]));
+}
+
+@end
diff --git a/src/input/apple/CMakeLists.txt b/src/input/apple/CMakeLists.txt
new file mode 100644
index 0000000..778409b
--- /dev/null
+++ b/src/input/apple/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(APPLE_SRC
+    HIDRemote/HIDRemote.h HIDRemote/HIDRemote.m
+    InputAppleRemote.h InputAppleRemote.mm
+    AppleRemoteDelegate.mm AppleRemoteDelegate.h
+    ${HID_SRC} InputAppleMediaKeys.h InputAppleMediaKeys.mm
+)
+add_sources(${APPLE_SRC})
\ No newline at end of file
diff --git a/src/input/apple/HIDRemote/HIDRemote.h b/src/input/apple/HIDRemote/HIDRemote.h
new file mode 100644
index 0000000..0ccf39f
--- /dev/null
+++ b/src/input/apple/HIDRemote/HIDRemote.h
@@ -0,0 +1,378 @@
+//
+//  HIDRemote.h
+//  HIDRemote V1.2
+//
+//  Created by Felix Schwarz on 06.04.07.
+//  Copyright 2007-2011 IOSPIRIT GmbH. All rights reserved.
+//
+//  The latest version of this class is available at
+//     http://www.iospirit.com/developers/hidremote/
+//
+//  ** LICENSE *************************************************************************
+//
+//  Copyright (c) 2007-2011 IOSPIRIT GmbH (http://www.iospirit.com/)
+//  All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without modification,
+//  are permitted provided that the following conditions are met:
+//
+//  * Redistributions of source code must retain the above copyright notice, this list
+//    of conditions and the following disclaimer.
+//
+//  * Redistributions in binary form must reproduce the above copyright notice, this
+//    list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+//  * Neither the name of IOSPIRIT GmbH nor the names of its contributors may be used to
+//    endorse or promote products derived from this software without specific prior
+//    written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+//  DAMAGE.
+//
+//  ************************************************************************************
+
+
+//  ************************************************************************************
+//  ********************************** DOCUMENTATION ***********************************
+//  ************************************************************************************
+//
+//  - a reference is available at http://www.iospirit.com/developers/hidremote/reference/
+//  - for a guide, please see http://www.iospirit.com/developers/hidremote/guide/
+//
+//  ************************************************************************************
+
+
+#import <Cocoa/Cocoa.h>
+
+#include <Carbon/Carbon.h>
+
+#include <unistd.h>
+#include <mach/mach.h>
+#include <sys/types.h>
+
+#include <IOKit/IOKitLib.h>
+#include <IOKit/IOCFPlugIn.h>
+#include <IOKit/IOMessage.h>
+#include <IOKit/hid/IOHIDKeys.h>
+#include <IOKit/hid/IOHIDLib.h>
+#include <IOKit/hid/IOHIDUsageTables.h>
+#include <IOKit/hidsystem/IOHIDLib.h>
+#include <IOKit/hidsystem/IOHIDParameter.h>
+#include <IOKit/hidsystem/IOHIDShared.h>
+
+#pragma mark -- Enums / Codes  --
+
+typedef enum
+{
+	kHIDRemoteModeNone = 0L,
+	kHIDRemoteModeShared,		// Share the remote with others - let's you listen to the remote control events as long as noone has an exclusive lock on it
+                                // (RECOMMENDED ONLY FOR SPECIAL PURPOSES)
+    
+	kHIDRemoteModeExclusive,	// Try to acquire an exclusive lock on the remote (NOT RECOMMENDED)
+    
+	kHIDRemoteModeExclusiveAuto	// Try to acquire an exclusive lock on the remote whenever the application has focus. Temporarily release control over the
+                                // remote when another application has focus (RECOMMENDED)
+} HIDRemoteMode;
+
+typedef enum
+{
+	/* A code reserved for "no button" (needed for tracking) */
+	kHIDRemoteButtonCodeNone	= 0L,
+    
+	/* Standard codes - available for white plastic and aluminum remote */
+	kHIDRemoteButtonCodeUp,
+	kHIDRemoteButtonCodeDown,
+	kHIDRemoteButtonCodeLeft,
+	kHIDRemoteButtonCodeRight,
+	kHIDRemoteButtonCodeCenter,
+	kHIDRemoteButtonCodeMenu,
+    
+	/* Extra codes - Only available for the new aluminum version of the remote */
+	kHIDRemoteButtonCodePlay,
+    
+	/* Masks */
+	kHIDRemoteButtonCodeCodeMask      = 0xFFL,
+	kHIDRemoteButtonCodeHoldMask      = (1L << 16L),
+	kHIDRemoteButtonCodeSpecialMask   = (1L << 17L),
+	kHIDRemoteButtonCodeAluminumMask  = (1L << 21L), // PRIVATE - only used internally
+    
+	/* Hold button standard codes - available for white plastic and aluminum remote */
+	kHIDRemoteButtonCodeUpHold       = (kHIDRemoteButtonCodeHoldMask|kHIDRemoteButtonCodeUp),
+	kHIDRemoteButtonCodeDownHold     = (kHIDRemoteButtonCodeHoldMask|kHIDRemoteButtonCodeDown),
+	kHIDRemoteButtonCodeLeftHold     = (kHIDRemoteButtonCodeHoldMask|kHIDRemoteButtonCodeLeft),
+	kHIDRemoteButtonCodeRightHold    = (kHIDRemoteButtonCodeHoldMask|kHIDRemoteButtonCodeRight),
+	kHIDRemoteButtonCodeCenterHold	 = (kHIDRemoteButtonCodeHoldMask|kHIDRemoteButtonCodeCenter),
+	kHIDRemoteButtonCodeMenuHold	 = (kHIDRemoteButtonCodeHoldMask|kHIDRemoteButtonCodeMenu),
+    
+	/* Hold button extra codes - Only available for aluminum version of the remote */
+	kHIDRemoteButtonCodePlayHold	  = (kHIDRemoteButtonCodeHoldMask|kHIDRemoteButtonCodePlay),
+    
+	/* DEPRECATED codes - compatibility with HIDRemote 1.0 */
+	kHIDRemoteButtonCodePlus	  = kHIDRemoteButtonCodeUp,
+	kHIDRemoteButtonCodePlusHold      = kHIDRemoteButtonCodeUpHold,
+	kHIDRemoteButtonCodeMinus	  = kHIDRemoteButtonCodeDown,
+	kHIDRemoteButtonCodeMinusHold     = kHIDRemoteButtonCodeDownHold,
+	kHIDRemoteButtonCodePlayPause	  = kHIDRemoteButtonCodeCenter,
+	kHIDRemoteButtonCodePlayPauseHold = kHIDRemoteButtonCodeCenterHold,
+    
+	/* Special purpose codes */
+	kHIDRemoteButtonCodeIDChanged  = (kHIDRemoteButtonCodeSpecialMask|(1L << 18L)),	// (the ID of the connected remote has changed, you can safely ignore this)
+#ifdef _HIDREMOTE_EXTENSIONS
+#define _HIDREMOTE_EXTENSIONS_SECTION 1
+#include "HIDRemoteAdditions.h"
+#undef _HIDREMOTE_EXTENSIONS_SECTION
+#endif /* _HIDREMOTE_EXTENSIONS */
+} HIDRemoteButtonCode;
+
+typedef enum
+{
+	kHIDRemoteModelUndetermined = 0L,				// Assume a white plastic remote
+	kHIDRemoteModelWhitePlastic,					// Signal *likely* to be coming from a white plastic remote
+	kHIDRemoteModelAluminum						// Signal *definitely* coming from an aluminum remote
+} HIDRemoteModel;
+
+typedef enum
+{
+	kHIDRemoteAluminumRemoteSupportLevelNone = 0L,			// This system has no support for the Aluminum Remote at all
+	kHIDRemoteAluminumRemoteSupportLevelEmulation,			// This system possibly has support for the Aluminum Remote (via emulation)
+	kHIDRemoteAluminumRemoteSupportLevelNative			// This system has native support for the Aluminum Remote
+} HIDRemoteAluminumRemoteSupportLevel;
+
+@class HIDRemote;
+
+#pragma mark -- Delegate protocol (mandatory) --
+@protocol HIDRemoteDelegate
+
+// Notification of button events
+- (void)hidRemote:(HIDRemote *)hidRemote				// The instance of HIDRemote sending this
+  eventWithButton:(HIDRemoteButtonCode)buttonCode			// Event for the button specified by code
+        isPressed:(BOOL)isPressed					// The button was pressed (YES) / released (NO)
+fromHardwareWithAttributes:(NSMutableDictionary *)attributes;	// Information on the device this event comes from
+
+@optional
+
+// Notification of ID changes
+- (void)hidRemote:(HIDRemote *)hidRemote				// Invoked when the user switched to a remote control with a different ID
+remoteIDChangedOldID:(SInt32)old
+            newID:(SInt32)newID
+forHardwareWithAttributes:(NSMutableDictionary *)attributes;
+
+// Notification about hardware additions/removals
+- (void)hidRemote:(HIDRemote *)hidRemote				// Invoked when new hardware was found / added to HIDRemote's pool
+foundNewHardwareWithAttributes:(NSMutableDictionary *)attributes;
+
+- (void)hidRemote:(HIDRemote *)hidRemote				// Invoked when initialization of new hardware as requested failed
+failedNewHardwareWithError:(NSError *)error;
+
+- (void)hidRemote:(HIDRemote *)hidRemote				// Invoked when hardware was removed from HIDRemote's pool
+releasedHardwareWithAttributes:(NSMutableDictionary *)attributes;
+
+// ### WARNING: Unless you know VERY PRECISELY what you are doing, do not implement any of the delegate methods below. ###
+
+// Matching of newly found receiver hardware
+- (BOOL)hidRemote:(HIDRemote *)hidRemote				// Invoked when new hardware is inspected
+inspectNewHardwareWithService:(io_service_t)service		//
+   prematchResult:(BOOL)prematchResult;				// Return YES if HIDRemote should go on with this hardware and try
+                                                    // to use it, or NO if it should not be persued further.
+
+// Exlusive lock lending
+- (BOOL)hidRemote:(HIDRemote *)hidRemote
+lendExclusiveLockToApplicationWithInfo:(NSDictionary *)applicationInfo;
+
+- (void)hidRemote:(HIDRemote *)hidRemote
+exclusiveLockReleasedByApplicationWithInfo:(NSDictionary *)applicationInfo;
+
+- (BOOL)hidRemote:(HIDRemote *)hidRemote
+shouldRetryExclusiveLockWithInfo:(NSDictionary *)applicationInfo;
+
+@end
+
+
+#pragma mark -- Actual header file for class  --
+
+@interface HIDRemote : NSObject
+{
+	// IOMasterPort
+	mach_port_t _masterPort;
+    
+	// Notification ports
+	IONotificationPortRef _notifyPort;
+	CFRunLoopSourceRef _notifyRLSource;
+    
+	// Matching iterator
+	io_iterator_t _matchingServicesIterator;
+    
+	// SecureInput notification
+	io_object_t _secureInputNotification;
+    
+	// Service attributes
+	NSMutableDictionary *_serviceAttribMap;
+    
+	// Mode
+	HIDRemoteMode _mode;
+	BOOL _autoRecover;
+	NSTimer *_autoRecoveryTimer;
+    
+	// Delegate
+	NSObject <HIDRemoteDelegate> *_delegate;
+    
+	// Last seen ID and remote model
+	SInt32 _lastSeenRemoteID;
+	HIDRemoteModel _lastSeenModel;
+	SInt32 _lastSeenModelRemoteID;
+    
+	// Unused button codes
+	NSArray *_unusedButtonCodes;
+    
+	// Simulate Plus/Minus Hold
+	BOOL _simulateHoldEvents;
+    
+	// SecureEventInput workaround
+	BOOL _secureEventInputWorkAround;
+	UInt64 _lastSecureEventInputPIDSum;
+	uid_t _lastFrontUserSession;
+    
+	// Exclusive lock lending
+	BOOL _exclusiveLockLending;
+	BOOL _sendExclusiveResourceReuseNotification;
+	NSNumber *_waitForReturnByPID;
+	NSNumber *_returnToPID;
+	BOOL _isRestarting;
+    
+	// Status notifications
+	BOOL _sendStatusNotifications;
+	NSString *_pidString;
+    
+	// Status
+	BOOL _applicationIsTerminating;
+	BOOL _isStopping;
+    
+	// Thread safety
+#ifdef HIDREMOTE_THREADSAFETY_HARDENED_NOTIFICATION_HANDLING /* #define HIDREMOTE_THREADSAFETY_HARDENED_NOTIFICATION_HANDLING if you're running your HIDRemote instance on a background thread (requires OS X 10.5 or later) */
+	NSThread *_runOnThread;
+#endif
+}
+
+#pragma mark -- PUBLIC: Shared HID Remote --
++ (HIDRemote *)sharedHIDRemote;
+
+#pragma mark -- PUBLIC: System Information --
++ (BOOL)isCandelairInstalled;
++ (BOOL)isCandelairInstallationRequiredForRemoteMode:(HIDRemoteMode)remoteMode;
+- (HIDRemoteAluminumRemoteSupportLevel)aluminiumRemoteSystemSupportLevel;
+
+#pragma mark -- PUBLIC: Interface / API --
+- (BOOL)startRemoteControl:(HIDRemoteMode)hidRemoteMode;
+- (void)stopRemoteControl;
+
+- (BOOL)isStarted;
+- (HIDRemoteMode)startedInMode;
+
+- (unsigned)activeRemoteControlCount;
+
+- (SInt32)lastSeenRemoteControlID;
+
+- (void)setLastSeenModel:(HIDRemoteModel)aModel;
+- (HIDRemoteModel)lastSeenModel;
+
+- (void)setDelegate:(NSObject <HIDRemoteDelegate> *)newDelegate;
+- (NSObject <HIDRemoteDelegate> *)delegate;
+
+- (void)setSimulateHoldEvents:(BOOL)newSimulateHoldEvents;
+- (BOOL)simulateHoldEvents;
+
+- (void)setUnusedButtonCodes:(NSArray *)newArrayWithUnusedButtonCodesAsNSNumbers;
+- (NSArray *)unusedButtonCodes;
+
+#pragma mark -- PUBLIC: Expert APIs --
+- (void)setEnableSecureEventInputWorkaround:(BOOL)newEnableSecureEventInputWorkaround;
+- (BOOL)enableSecureEventInputWorkaround;
+
+- (void)setExclusiveLockLendingEnabled:(BOOL)newExclusiveLockLendingEnabled;
+- (BOOL)exclusiveLockLendingEnabled;
+
+- (BOOL)isApplicationTerminating;
+- (BOOL)isStopping;
+
+#pragma mark -- PRIVATE: HID Event handling --
+- (void)_handleButtonCode:(HIDRemoteButtonCode)buttonCode isPressed:(BOOL)isPressed hidAttribsDict:(NSMutableDictionary *)hidAttribsDict;
+- (void)_sendButtonCode:(HIDRemoteButtonCode)buttonCode isPressed:(BOOL)isPressed hidAttribsDict:(NSMutableDictionary *)hidAttribsDict;
+- (void)_hidEventFor:(io_service_t)hidDevice from:(IOHIDQueueInterface **)interface withResult:(IOReturn)result;
+
+#pragma mark -- PRIVATE: Service setup and destruction --
+- (BOOL)_prematchService:(io_object_t)service;
+- (HIDRemoteButtonCode)buttonCodeForUsage:(unsigned int)usage usagePage:(unsigned int)usagePage;
+- (BOOL)_setupService:(io_object_t)service;
+- (void)_destructService:(io_object_t)service;
+
+#pragma mark -- PRIVATE: Distributed notifiations handling --
+- (void)_postStatusWithAction:(NSString *)action;
+- (void)_handleNotifications:(NSNotification *)notification;
+- (void)_setSendStatusNotifications:(BOOL)doSend;
+- (BOOL)_sendStatusNotifications;
+
+#pragma mark -- PRIVATE: Application becomes active / inactive handling for kHIDRemoteModeExclusiveAuto --
+- (void)_appStatusChanged:(NSNotification *)notification;
+- (void)_delayedAutoRecovery:(NSTimer *)aTimer;
+
+#pragma mark -- PRIVATE: Notification handling --
+- (void)_serviceMatching:(io_iterator_t)iterator;
+- (void)_serviceNotificationFor:(io_service_t)service messageType:(natural_t)messageType messageArgument:(void *)messageArgument;
+- (void)_updateSessionInformation;
+- (void)_secureInputNotificationFor:(io_service_t)service messageType:(natural_t)messageType messageArgument:(void *)messageArgument;
+
+@end
+
+#pragma mark -- Information attribute keys --
+extern NSString *kHIDRemoteManufacturer;
+extern NSString *kHIDRemoteProduct;
+extern NSString *kHIDRemoteTransport;
+
+#pragma mark -- Internal/Expert attribute keys (AKA: don't touch these unless you really, really, REALLY know what you do) --
+extern NSString *kHIDRemoteCFPluginInterface;
+extern NSString *kHIDRemoteHIDDeviceInterface;
+extern NSString *kHIDRemoteCookieButtonCodeLUT;
+extern NSString *kHIDRemoteHIDQueueInterface;
+extern NSString *kHIDRemoteServiceNotification;
+extern NSString *kHIDRemoteCFRunLoopSource;
+extern NSString *kHIDRemoteLastButtonPressed;
+extern NSString *kHIDRemoteService;
+extern NSString *kHIDRemoteSimulateHoldEventsTimer;
+extern NSString *kHIDRemoteSimulateHoldEventsOriginButtonCode;
+extern NSString *kHIDRemoteAluminumRemoteSupportLevel;
+extern NSString *kHIDRemoteAluminumRemoteSupportOnDemand;
+
+#pragma mark -- Distributed notifications --
+extern NSString *kHIDRemoteDNHIDRemotePing;
+extern NSString *kHIDRemoteDNHIDRemoteRetry;
+extern NSString *kHIDRemoteDNHIDRemoteStatus;
+
+extern NSString *kHIDRemoteDNHIDRemoteRetryGlobalObject;
+
+#pragma mark -- Distributed notifications userInfo keys and values --
+extern NSString *kHIDRemoteDNStatusHIDRemoteVersionKey;
+extern NSString *kHIDRemoteDNStatusPIDKey;
+extern NSString *kHIDRemoteDNStatusModeKey;
+extern NSString *kHIDRemoteDNStatusUnusedButtonCodesKey;
+extern NSString *kHIDRemoteDNStatusRemoteControlCountKey;
+extern NSString *kHIDRemoteDNStatusReturnToPIDKey;
+extern NSString *kHIDRemoteDNStatusActionKey;
+extern NSString *kHIDRemoteDNStatusActionStart;
+extern NSString *kHIDRemoteDNStatusActionStop;
+extern NSString *kHIDRemoteDNStatusActionUpdate;
+extern NSString *kHIDRemoteDNStatusActionNoNeed;
+
+#pragma mark -- Driver compatibility flags --
+typedef enum
+{
+	kHIDRemoteCompatibilityFlagsStandardHIDRemoteDevice = 1L,
+} HIDRemoteCompatibilityFlags;
diff --git a/src/input/apple/HIDRemote/HIDRemote.m b/src/input/apple/HIDRemote/HIDRemote.m
new file mode 100644
index 0000000..47bce32
--- /dev/null
+++ b/src/input/apple/HIDRemote/HIDRemote.m
@@ -0,0 +1,1953 @@
+//
+//  HIDRemote.m
+//  HIDRemote V1.2 (27th May 2011)
+//
+//  Created by Felix Schwarz on 06.04.07.
+//  Copyright 2007-2011 IOSPIRIT GmbH. All rights reserved.
+//
+//  The latest version of this class is available at
+//     http://www.iospirit.com/developers/hidremote/
+//
+//  ** LICENSE *************************************************************************
+//
+//  Copyright (c) 2007-2011 IOSPIRIT GmbH (http://www.iospirit.com/)
+//  All rights reserved.
+//
+//  Redistribution and use in source and binary forms, with or without modification,
+//  are permitted provided that the following conditions are met:
+//
+//  * Redistributions of source code must retain the above copyright notice, this list
+//    of conditions and the following disclaimer.
+//
+//  * Redistributions in binary form must reproduce the above copyright notice, this
+//    list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+//  * Neither the name of IOSPIRIT GmbH nor the names of its contributors may be used to
+//    endorse or promote products derived from this software without specific prior
+//    written permission.
+//
+//  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+//  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+//  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+//  SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+//  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+//  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+//  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+//  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+//  DAMAGE.
+//
+//  ************************************************************************************
+
+//  ************************************************************************************
+//  ********************************** DOCUMENTATION ***********************************
+//  ************************************************************************************
+//
+//  - a reference is available at http://www.iospirit.com/developers/hidremote/reference/
+//  - for a guide, please see http://www.iospirit.com/developers/hidremote/guide/
+//
+//  ************************************************************************************
+
+#import "HIDRemote.h"
+
+// Callback Prototypes
+static void HIDEventCallback(void * target,
+                             IOReturn result,
+                             void * refcon,
+                             void * sender);
+
+static void ServiceMatchingCallback(void *refCon,
+                                    io_iterator_t iterator);
+
+static void ServiceNotificationCallback(void *      refCon,
+                                        io_service_t    service,
+                                        natural_t   messageType,
+                                        void *      messageArgument);
+
+static void SecureInputNotificationCallback(void *      refCon,
+                                            io_service_t    service,
+                                            natural_t   messageType,
+                                            void *      messageArgument);
+
+// Shared HIDRemote instance
+static HIDRemote *sHIDRemote = nil;
+
+@implementation HIDRemote
+
+#pragma mark -- Init, dealloc & shared instance --
+
++ (HIDRemote *)sharedHIDRemote
+{
+    if (sHIDRemote==nil)
+    {
+        sHIDRemote = [[HIDRemote alloc] init];
+    }
+
+    return (sHIDRemote);
+}
+
+- (id)init
+{
+    if ((self = [super init]) != nil)
+    {
+#ifdef HIDREMOTE_THREADSAFETY_HARDENED_NOTIFICATION_HANDLING
+        _runOnThread = [NSThread currentThread];
+#endif
+
+        // Detect application becoming active/inactive
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_appStatusChanged:)    name:NSApplicationDidBecomeActiveNotification  object:[NSApplication sharedApplication]];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_appStatusChanged:)    name:NSApplicationWillResignActiveNotification object:[NSApplication sharedApplication]];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_appStatusChanged:)    name:NSApplicationWillTerminateNotification    object:[NSApplication sharedApplication]];
+
+        // Handle distributed notifications
+        _pidString = [[NSString alloc] initWithFormat:@"%d", getpid()];
+
+        [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(_handleNotifications:) name:kHIDRemoteDNHIDRemotePing  object:nil];
+        [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(_handleNotifications:) name:kHIDRemoteDNHIDRemoteRetry object:kHIDRemoteDNHIDRemoteRetryGlobalObject];
+        [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(_handleNotifications:) name:kHIDRemoteDNHIDRemoteRetry object:_pidString];
+
+        // Enabled by default: simulate hold events for plus/minus
+        _simulateHoldEvents = YES;
+
+        // Enabled by default: work around for a locking issue introduced with Security Update 2008-004 / 10.4.9 and beyond (credit for finding this workaround goes to Martin Kahr)
+        _secureEventInputWorkAround = YES;
+        _secureInputNotification = 0;
+
+        // Initialize instance variables
+        _lastSeenRemoteID = -1;
+        _lastSeenModel = kHIDRemoteModelUndetermined;
+        _unusedButtonCodes = [[NSMutableArray alloc] init];
+        _exclusiveLockLending = NO;
+        _sendExclusiveResourceReuseNotification = YES;
+        _applicationIsTerminating = NO;
+
+        // Send status notifications
+        _sendStatusNotifications = YES;
+    }
+
+    return (self);
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillTerminateNotification object:[NSApplication sharedApplication]];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationWillResignActiveNotification object:[NSApplication sharedApplication]];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSApplicationDidBecomeActiveNotification object:[NSApplication sharedApplication]];
+
+    [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:kHIDRemoteDNHIDRemotePing  object:nil];
+    [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:kHIDRemoteDNHIDRemoteRetry object:kHIDRemoteDNHIDRemoteRetryGlobalObject];
+    [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:kHIDRemoteDNHIDRemoteRetry object:_pidString];
+    [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:nil object:nil]; /* As demanded by the documentation for -[NSDistributedNotificationCenter removeObserver:name:object:] */
+
+    [self stopRemoteControl];
+
+    [self setExclusiveLockLendingEnabled:NO];
+
+    [self setDelegate:nil];
+
+    _unusedButtonCodes = nil;
+
+#ifdef HIDREMOTE_THREADSAFETY_HARDENED_NOTIFICATION_HANDLING
+    _runOnThread = nil;
+#endif
+
+    _pidString = nil;
+}
+
+#pragma mark -- PUBLIC: System Information --
++ (BOOL)isCandelairInstalled
+{
+    mach_port_t masterPort = 0;
+    kern_return_t   kernResult;
+    io_service_t    matchingService = 0;
+    BOOL isInstalled = NO;
+
+    kernResult = IOMasterPort(MACH_PORT_NULL, &masterPort);
+    if ((kernResult!=kIOReturnSuccess) || (masterPort==0)) { return(NO); }
+
+    if ((matchingService = IOServiceGetMatchingService(masterPort, IOServiceMatching("IOSPIRITIRController"))) != 0)
+    {
+        isInstalled = YES;
+        IOObjectRelease((io_object_t) matchingService);
+    }
+
+    mach_port_deallocate(mach_task_self(), masterPort);
+
+    return (isInstalled);
+}
+
++ (BOOL)isCandelairInstallationRequiredForRemoteMode:(HIDRemoteMode)remoteMode
+{
+    return (NO);
+}
+
+- (HIDRemoteAluminumRemoteSupportLevel)aluminiumRemoteSystemSupportLevel
+{
+    HIDRemoteAluminumRemoteSupportLevel supportLevel = kHIDRemoteAluminumRemoteSupportLevelNone;
+
+    for (NSDictionary *hidAttribsDict in [_serviceAttribMap objectEnumerator])
+    {
+        NSNumber *deviceSupportLevel;
+
+        if ((deviceSupportLevel = hidAttribsDict[kHIDRemoteAluminumRemoteSupportLevel]) != nil)
+        {
+            if ([deviceSupportLevel intValue] > (int)supportLevel)
+            {
+                supportLevel = [deviceSupportLevel intValue];
+            }
+        }
+    }
+
+    return (supportLevel);
+}
+
+#pragma mark -- PUBLIC: Interface / API --
+- (BOOL)startRemoteControl:(HIDRemoteMode)hidRemoteMode
+{
+    if ((_mode == kHIDRemoteModeNone) && (hidRemoteMode != kHIDRemoteModeNone))
+    {
+        kern_return_t       kernReturn;
+        CFMutableDictionaryRef  matchDict=NULL;
+        io_service_t rootService;
+
+        do
+        {
+            // Get IOKit master port
+            kernReturn = IOMasterPort(bootstrap_port, &_masterPort);
+            if ((kernReturn!=kIOReturnSuccess) || (_masterPort==0)) { break; }
+
+            // Setup notification port
+            _notifyPort = IONotificationPortCreate(_masterPort);
+
+            if ((_notifyRLSource = IONotificationPortGetRunLoopSource(_notifyPort)) != NULL)
+            {
+                CFRunLoopAddSource( CFRunLoopGetCurrent(),
+                                   _notifyRLSource,
+                                   kCFRunLoopCommonModes);
+            }
+            else
+            {
+                break;
+            }
+
+            // Setup SecureInput notification
+            if ((hidRemoteMode == kHIDRemoteModeExclusive) || (hidRemoteMode == kHIDRemoteModeExclusiveAuto))
+            {
+                if ((rootService = IORegistryEntryFromPath(_masterPort, kIOServicePlane ":/")) != 0)
+                {
+                    kernReturn = IOServiceAddInterestNotification(  _notifyPort,
+                                                                  rootService,
+                                                                  kIOBusyInterest,
+                                                                  SecureInputNotificationCallback,
+                                                                  (__bridge void *)self,
+                                                                  &_secureInputNotification);
+                    if (kernReturn != kIOReturnSuccess) { break; }
+
+                    [self _updateSessionInformation];
+                }
+                else
+                {
+                    break;
+                }
+            }
+
+            // Setup notification matching dict
+            matchDict = IOServiceMatching(kIOHIDDeviceKey);
+            CFRetain(matchDict);
+
+            // Actually add notification
+            kernReturn = IOServiceAddMatchingNotification(  _notifyPort,
+                                                          kIOFirstMatchNotification,
+                                                          matchDict,            // one reference count consumed by this call
+                                                          ServiceMatchingCallback,
+                                                          (__bridge void *) self,
+                                                          &_matchingServicesIterator);
+            if (kernReturn != kIOReturnSuccess) { break; }
+
+            // Setup serviceAttribMap
+            _serviceAttribMap = [[NSMutableDictionary alloc] init];
+            if (_serviceAttribMap==nil) { break; }
+
+            // Phew .. everything went well!
+            _mode = hidRemoteMode;
+            CFRelease(matchDict);
+
+            [self _serviceMatching:_matchingServicesIterator];
+
+            [self _postStatusWithAction:kHIDRemoteDNStatusActionStart];
+
+            return (YES);
+
+        }while(0);
+
+        // An error occured. Do necessary clean up.
+        if (matchDict!=NULL)
+        {
+            CFRelease(matchDict);
+            matchDict = NULL;
+        }
+
+        [self stopRemoteControl];
+    }
+
+    return (NO);
+}
+
+- (void)stopRemoteControl
+{
+    UInt32 serviceCount = 0;
+
+    _autoRecover = NO;
+    _isStopping = YES;
+
+    if (_autoRecoveryTimer!=nil)
+    {
+        [_autoRecoveryTimer invalidate];
+        _autoRecoveryTimer = nil;
+    }
+
+    if (_serviceAttribMap!=nil)
+    {
+        NSDictionary *cloneDict = [[NSDictionary alloc] initWithDictionary:_serviceAttribMap];
+
+        for (NSNumber *serviceValue in [cloneDict keyEnumerator])
+        {
+            [self _destructService:(io_object_t)[serviceValue unsignedIntValue]];
+            serviceCount++;
+        };
+
+        _serviceAttribMap = nil;
+    }
+
+    if (_matchingServicesIterator!=0)
+    {
+        IOObjectRelease((io_object_t) _matchingServicesIterator);
+        _matchingServicesIterator = 0;
+    }
+
+    if (_secureInputNotification!=0)
+    {
+        IOObjectRelease((io_object_t) _secureInputNotification);
+        _secureInputNotification = 0;
+    }
+
+    if (_notifyRLSource!=NULL)
+    {
+        CFRunLoopSourceInvalidate(_notifyRLSource);
+        _notifyRLSource = NULL;
+    }
+
+    if (_notifyPort!=NULL)
+    {
+        IONotificationPortDestroy(_notifyPort);
+        _notifyPort = NULL;
+    }
+
+    if (_masterPort!=0)
+    {
+        mach_port_deallocate(mach_task_self(), _masterPort);
+        _masterPort = 0;
+    }
+
+    _returnToPID = nil;
+
+    if (_mode!=kHIDRemoteModeNone)
+    {
+        // Post status
+        [self _postStatusWithAction:kHIDRemoteDNStatusActionStop];
+
+        if (_sendStatusNotifications)
+        {
+            // In case we were not ready to lend it earlier, tell other HIDRemote apps that the resources (if any were used) are now again available for use by other applications
+            if (((_mode==kHIDRemoteModeExclusive) || (_mode==kHIDRemoteModeExclusiveAuto)) && (_sendExclusiveResourceReuseNotification==YES) && (_exclusiveLockLending==NO) && (serviceCount>0))
+            {
+                _mode = kHIDRemoteModeNone;
+
+                if (!_isRestarting)
+                {
+                    [[NSDistributedNotificationCenter defaultCenter] postNotificationName:kHIDRemoteDNHIDRemoteRetry
+                                                                                   object:kHIDRemoteDNHIDRemoteRetryGlobalObject
+                                                                                 userInfo:@{kHIDRemoteDNStatusPIDKey: @((unsigned int)getpid()),
+                                                                                           (NSString *)kCFBundleIdentifierKey: [[NSBundle mainBundle] bundleIdentifier]}
+                                                                       deliverImmediately:YES];
+                }
+            }
+        }
+    }
+
+    _mode = kHIDRemoteModeNone;
+    _isStopping = NO;
+}
+
+- (BOOL)isStarted
+{
+    return (_mode != kHIDRemoteModeNone);
+}
+
+- (HIDRemoteMode)startedInMode
+{
+    return (_mode);
+}
+
+- (unsigned)activeRemoteControlCount
+{
+    return (int)[_serviceAttribMap count];
+}
+
+- (SInt32)lastSeenRemoteControlID
+{
+    return (_lastSeenRemoteID);
+}
+
+- (HIDRemoteModel)lastSeenModel
+{
+    return (_lastSeenModel);
+}
+
+- (void)setLastSeenModel:(HIDRemoteModel)aModel
+{
+    _lastSeenModel = aModel;
+}
+
+- (void)setSimulateHoldEvents:(BOOL)newSimulateHoldEvents
+{
+    _simulateHoldEvents = newSimulateHoldEvents;
+}
+
+- (BOOL)simulateHoldEvents
+{
+    return (_simulateHoldEvents);
+}
+
+- (NSArray *)unusedButtonCodes
+{
+    return (_unusedButtonCodes);
+}
+
+- (void)setUnusedButtonCodes:(NSArray *)newArrayWithUnusedButtonCodesAsNSNumbers
+{
+    _unusedButtonCodes = newArrayWithUnusedButtonCodesAsNSNumbers;
+
+    [self _postStatusWithAction:kHIDRemoteDNStatusActionUpdate];
+}
+
+- (void)setDelegate:(NSObject <HIDRemoteDelegate> *)newDelegate
+{
+    _delegate = newDelegate;
+}
+
+- (NSObject <HIDRemoteDelegate> *)delegate
+{
+    return (_delegate);
+}
+
+#pragma mark -- PUBLIC: Expert APIs --
+- (void)setEnableSecureEventInputWorkaround:(BOOL)newEnableSecureEventInputWorkaround
+{
+    _secureEventInputWorkAround = newEnableSecureEventInputWorkaround;
+}
+
+- (BOOL)enableSecureEventInputWorkaround
+{
+    return (_secureEventInputWorkAround);
+}
+
+- (void)setExclusiveLockLendingEnabled:(BOOL)newExclusiveLockLendingEnabled
+{
+    if (newExclusiveLockLendingEnabled != _exclusiveLockLending)
+    {
+        _exclusiveLockLending = newExclusiveLockLendingEnabled;
+
+        if (_exclusiveLockLending)
+        {
+            [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(_handleNotifications:) name:kHIDRemoteDNHIDRemoteStatus object:nil];
+        }
+        else
+        {
+            [[NSDistributedNotificationCenter defaultCenter] removeObserver:self name:kHIDRemoteDNHIDRemoteStatus object:nil];
+
+            _waitForReturnByPID = nil;
+        }
+    }
+}
+
+- (BOOL)exclusiveLockLendingEnabled
+{
+    return (_exclusiveLockLending);
+}
+
+- (void)setSendExclusiveResourceReuseNotification:(BOOL)newSendExclusiveResourceReuseNotification
+{
+    _sendExclusiveResourceReuseNotification = newSendExclusiveResourceReuseNotification;
+}
+
+- (BOOL)sendExclusiveResourceReuseNotification
+{
+    return (_sendExclusiveResourceReuseNotification);
+}
+
+- (BOOL)isApplicationTerminating
+{
+    return (_applicationIsTerminating);
+}
+
+- (BOOL)isStopping
+{
+    return (_isStopping);
+}
+
+#pragma mark -- PRIVATE: Application becomes active / inactive handling for kHIDRemoteModeExclusiveAuto --
+- (void)_appStatusChanged:(NSNotification *)notification
+{
+#ifdef HIDREMOTE_THREADSAFETY_HARDENED_NOTIFICATION_HANDLING
+    if ([self respondsToSelector:@selector(performSelector:onThread:withObject:waitUntilDone:)]) // OS X 10.5+ only
+    {
+        if ([NSThread currentThread] != _runOnThread)
+        {
+            if ([[notification name] isEqual:NSApplicationDidBecomeActiveNotification])
+            {
+                if (!_autoRecover)
+                {
+                    return;
+                }
+            }
+
+            if ([[notification name] isEqual:NSApplicationWillResignActiveNotification])
+            {
+                if (_mode != kHIDRemoteModeExclusiveAuto)
+                {
+                    return;
+                }
+            }
+
+            [self performSelector:@selector(_appStatusChanged:) onThread:_runOnThread withObject:notification waitUntilDone:[[notification name] isEqual:NSApplicationWillTerminateNotification]];
+            return;
+        }
+    }
+#endif
+
+    if (notification!=nil)
+    {
+        if (_autoRecoveryTimer!=nil)
+        {
+            [_autoRecoveryTimer invalidate];
+            _autoRecoveryTimer = nil;
+        }
+
+        if ([[notification name] isEqual:NSApplicationDidBecomeActiveNotification])
+        {
+            if (_autoRecover)
+            {
+                // Delay autorecover by 0.1 to avoid race conditions
+                if ((_autoRecoveryTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:0.1] interval:0.1 target:self selector:@selector(_delayedAutoRecovery:) userInfo:nil repeats:NO]) != nil)
+                {
+                    [[NSRunLoop currentRunLoop] addTimer:_autoRecoveryTimer forMode:NSRunLoopCommonModes];
+                }
+            }
+        }
+
+        if ([[notification name] isEqual:NSApplicationWillResignActiveNotification])
+        {
+            if (_mode == kHIDRemoteModeExclusiveAuto)
+            {
+                [self stopRemoteControl];
+                _autoRecover = YES;
+            }
+        }
+
+        if ([[notification name] isEqual:NSApplicationWillTerminateNotification])
+        {
+            _applicationIsTerminating = YES;
+
+            if ([self isStarted])
+            {
+                [self stopRemoteControl];
+            }
+        }
+    }
+}
+
+- (void)_delayedAutoRecovery:(NSTimer *)aTimer
+{
+    [_autoRecoveryTimer invalidate];
+    _autoRecoveryTimer = nil;
+
+    if (_autoRecover)
+    {
+        [self startRemoteControl:kHIDRemoteModeExclusiveAuto];
+        _autoRecover = NO;
+    }
+}
+
+
+#pragma mark -- PRIVATE: Distributed notifiations handling --
+- (void)_postStatusWithAction:(NSString *)action
+{
+    if (_sendStatusNotifications)
+    {
+        NSDictionary* d = @{kHIDRemoteDNStatusHIDRemoteVersionKey: @1,
+                            kHIDRemoteDNStatusPIDKey: @((unsigned int)getpid()),
+                            kHIDRemoteDNStatusModeKey: @((int)_mode),
+                            kHIDRemoteDNStatusRemoteControlCountKey: @((unsigned int)[self activeRemoteControlCount]),
+                            kHIDRemoteDNStatusUnusedButtonCodesKey: ((_unusedButtonCodes!=nil) ? _unusedButtonCodes : @[]),
+                            kHIDRemoteDNStatusActionKey: action,
+                            (NSString *)kCFBundleIdentifierKey: [[NSBundle mainBundle] bundleIdentifier]};
+
+        NSMutableDictionary* md = [NSMutableDictionary dictionaryWithDictionary:d];
+
+        if (_returnToPID) {
+            md[kHIDRemoteDNStatusReturnToPIDKey] = _returnToPID;
+        }
+
+        [[NSDistributedNotificationCenter defaultCenter] postNotificationName:kHIDRemoteDNHIDRemoteStatus
+                                                                       object:((_pidString!=nil) ? _pidString : [NSString stringWithFormat:@"%d",getpid()])
+                                                                     userInfo:[md copy]
+                                                           deliverImmediately:YES
+        ];
+    }
+}
+
+- (void)_handleNotifications:(NSNotification *)notification
+{
+    NSString *notificationName;
+
+#ifdef HIDREMOTE_THREADSAFETY_HARDENED_NOTIFICATION_HANDLING
+    if ([self respondsToSelector:@selector(performSelector:onThread:withObject:waitUntilDone:)]) // OS X 10.5+ only
+    {
+        if ([NSThread currentThread] != _runOnThread)
+        {
+            [self performSelector:@selector(_handleNotifications:) onThread:_runOnThread withObject:notification waitUntilDone:NO];
+            return;
+        }
+    }
+#endif
+
+    if ((notification!=nil) && ((notificationName = [notification name]) != nil))
+    {
+        if ([notificationName isEqual:kHIDRemoteDNHIDRemotePing])
+        {
+            [self _postStatusWithAction:kHIDRemoteDNStatusActionUpdate];
+        }
+
+        if ([notificationName isEqual:kHIDRemoteDNHIDRemoteRetry])
+        {
+            if ([self isStarted])
+            {
+                BOOL retry = YES;
+
+                // Ignore our own global retry broadcasts
+                if ([[notification object] isEqual:kHIDRemoteDNHIDRemoteRetryGlobalObject])
+                {
+                    NSNumber *fromPID;
+
+                    if ((fromPID = [notification userInfo][kHIDRemoteDNStatusPIDKey]) != nil)
+                    {
+                        if (getpid() == (int)[fromPID unsignedIntValue])
+                        {
+                            retry = NO;
+                        }
+                    }
+                }
+
+                if (retry)
+                {
+                    if (([self delegate] != nil) &&
+                        ([[self delegate] respondsToSelector:@selector(hidRemote:shouldRetryExclusiveLockWithInfo:)]))
+                    {
+                        retry = [[self delegate] hidRemote:self shouldRetryExclusiveLockWithInfo:[notification userInfo]];
+                    }
+                }
+
+                if (retry)
+                {
+                    HIDRemoteMode restartInMode = _mode;
+
+                    if (restartInMode != kHIDRemoteModeNone)
+                    {
+                        _isRestarting = YES;
+                        [self stopRemoteControl];
+
+                        _returnToPID = nil;
+
+                        [self startRemoteControl:restartInMode];
+                        _isRestarting = NO;
+
+                        if (restartInMode != kHIDRemoteModeShared)
+                        {
+                            _returnToPID = [notification userInfo][kHIDRemoteDNStatusPIDKey];
+                        }
+                    }
+                }
+                else
+                {
+                    NSNumber *cacheReturnPID = _returnToPID;
+
+                    _returnToPID = [notification userInfo][kHIDRemoteDNStatusPIDKey];
+                    [self _postStatusWithAction:kHIDRemoteDNStatusActionNoNeed];
+
+                    _returnToPID = cacheReturnPID;
+                }
+            }
+        }
+
+        if (_exclusiveLockLending)
+        {
+            if ([notificationName isEqual:kHIDRemoteDNHIDRemoteStatus])
+            {
+                NSString *action;
+
+                if ((action = [notification userInfo][kHIDRemoteDNStatusActionKey]) != nil)
+                {
+                    if ((_mode == kHIDRemoteModeNone) && (_waitForReturnByPID!=nil))
+                    {
+                        NSNumber *pidNumber, *returnToPIDNumber;
+
+                        if ((pidNumber      = [notification userInfo][kHIDRemoteDNStatusPIDKey]) != nil)
+                        {
+                            returnToPIDNumber = [notification userInfo][kHIDRemoteDNStatusReturnToPIDKey];
+                            if (returnToPIDNumber == (id)[NSNull null]) {
+                                returnToPIDNumber = nil;
+                            }
+
+                            if ([action isEqual:kHIDRemoteDNStatusActionStart])
+                            {
+                                if ([pidNumber isEqual:_waitForReturnByPID])
+                                {
+                                    NSNumber *startMode;
+
+                                    if ((startMode = [notification userInfo][kHIDRemoteDNStatusModeKey]) != nil)
+                                    {
+                                        if ([startMode intValue] == kHIDRemoteModeShared)
+                                        {
+                                            returnToPIDNumber = @(getpid());
+                                            action = kHIDRemoteDNStatusActionNoNeed;
+                                        }
+                                    }
+                                }
+                            }
+
+                            if (returnToPIDNumber != nil)
+                            {
+                                if ([action isEqual:kHIDRemoteDNStatusActionStop] || [action isEqual:kHIDRemoteDNStatusActionNoNeed])
+                                {
+                                    if ([pidNumber isEqual:_waitForReturnByPID] && ([returnToPIDNumber intValue] == getpid()))
+                                    {
+                                        _waitForReturnByPID = nil;
+
+                                        if (([self delegate] != nil) &&
+                                            ([[self delegate] respondsToSelector:@selector(hidRemote:exclusiveLockReleasedByApplicationWithInfo:)]))
+                                        {
+                                            [[self delegate] hidRemote:self exclusiveLockReleasedByApplicationWithInfo:[notification userInfo]];
+                                        }
+                                        else
+                                        {
+                                            [self startRemoteControl:kHIDRemoteModeExclusive];
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if (_mode==kHIDRemoteModeExclusive)
+                    {
+                        if ([action isEqual:kHIDRemoteDNStatusActionStart])
+                        {
+                            NSNumber *originPID = [notification userInfo][kHIDRemoteDNStatusPIDKey];
+                            BOOL lendLock = YES;
+
+                            if ([originPID intValue] != getpid())
+                            {
+                                if (([self delegate] != nil) &&
+                                    ([[self delegate] respondsToSelector:@selector(hidRemote:lendExclusiveLockToApplicationWithInfo:)]))
+                                {
+                                    lendLock = [[self delegate] hidRemote:self lendExclusiveLockToApplicationWithInfo:[notification userInfo]];
+                                }
+
+                                if (lendLock)
+                                {
+                                    _waitForReturnByPID = originPID;
+
+                                    if (_waitForReturnByPID != nil)
+                                    {
+                                        [self stopRemoteControl];
+
+                                        [[NSDistributedNotificationCenter defaultCenter] postNotificationName:kHIDRemoteDNHIDRemoteRetry
+                                                                                                       object:[NSString stringWithFormat:@"%d", [_waitForReturnByPID intValue]]
+                                                                                                     userInfo:@{kHIDRemoteDNStatusPIDKey: @((unsigned int)getpid()),
+                                                                                                               (NSString *)kCFBundleIdentifierKey: [[NSBundle mainBundle] bundleIdentifier]}
+                                                                                           deliverImmediately:YES];
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+- (void)_setSendStatusNotifications:(BOOL)doSend
+{
+    _sendStatusNotifications = doSend;
+}
+
+- (BOOL)_sendStatusNotifications
+{
+    return (_sendStatusNotifications);
+}
+
+#pragma mark -- PRIVATE: Service setup and destruction --
+- (BOOL)_prematchService:(io_object_t)service
+{
+    BOOL serviceMatches = NO;
+    NSString *ioClass;
+    NSNumber *candelairHIDRemoteCompatibilityMask;
+
+    if (service != 0)
+    {
+        // IOClass matching
+        if ((ioClass = (__bridge_transfer NSString *)IORegistryEntryCreateCFProperty((io_registry_entry_t)service,
+                                                                   CFSTR(kIOClassKey),
+                                                                   kCFAllocatorDefault,
+                                                                   0)) != nil)
+        {
+            // Match on apple's AppleIRController and old versions of the Remote Buddy IR Controller
+            if ([ioClass isEqual:@"AppleIRController"] || [ioClass isEqual:@"RBIOKitAIREmu"])
+            {
+                CFTypeRef candelairHIDRemoteCompatibilityDevice;
+
+                serviceMatches = YES;
+
+                if ((candelairHIDRemoteCompatibilityDevice = IORegistryEntryCreateCFProperty((io_registry_entry_t)service, CFSTR("CandelairHIDRemoteCompatibilityDevice"), kCFAllocatorDefault, 0)) != NULL)
+                {
+                    if (CFEqual(kCFBooleanTrue, candelairHIDRemoteCompatibilityDevice))
+                    {
+                        serviceMatches = NO;
+                    }
+
+                    CFRelease (candelairHIDRemoteCompatibilityDevice);
+                }
+            }
+
+            // Match on the virtual IOSPIRIT IR Controller
+            if ([ioClass isEqual:@"IOSPIRITIRController"])
+            {
+                serviceMatches = YES;
+            }
+        }
+
+        // Match on services that claim compatibility with the HID Remote class (Candelair or third-party) by having a property of CandelairHIDRemoteCompatibilityMask = 1 <Type: Number>
+        if ((candelairHIDRemoteCompatibilityMask = (__bridge_transfer NSNumber *)IORegistryEntryCreateCFProperty((io_registry_entry_t)service, CFSTR("CandelairHIDRemoteCompatibilityMask"), kCFAllocatorDefault, 0)) != nil)
+        {
+            if ([candelairHIDRemoteCompatibilityMask isKindOfClass:[NSNumber class]])
+            {
+                if ([candelairHIDRemoteCompatibilityMask unsignedIntValue] & kHIDRemoteCompatibilityFlagsStandardHIDRemoteDevice)
+                {
+                    serviceMatches = YES;
+                }
+                else
+                {
+                    serviceMatches = NO;
+                }
+            }
+        }
+    }
+
+    if (([self delegate]!=nil) &&
+        ([[self delegate] respondsToSelector:@selector(hidRemote:inspectNewHardwareWithService:prematchResult:)]))
+    {
+        serviceMatches = [((NSObject <HIDRemoteDelegate> *)[self delegate]) hidRemote:self inspectNewHardwareWithService:service prematchResult:serviceMatches];
+    }
+
+    return (serviceMatches);
+}
+
+- (HIDRemoteButtonCode)buttonCodeForUsage:(unsigned int)usage usagePage:(unsigned int)usagePage
+{
+    HIDRemoteButtonCode buttonCode = kHIDRemoteButtonCodeNone;
+
+    switch (usagePage)
+    {
+        case kHIDPage_Consumer:
+            switch (usage)
+        {
+            case kHIDUsage_Csmr_MenuPick:
+                // Aluminum Remote: Center
+                buttonCode = (kHIDRemoteButtonCodeCenter|kHIDRemoteButtonCodeAluminumMask);
+                break;
+
+            case kHIDUsage_Csmr_ModeStep:
+                // Aluminium Remote: Center Hold
+                buttonCode = (kHIDRemoteButtonCodeCenterHold|kHIDRemoteButtonCodeAluminumMask);
+                break;
+
+            case kHIDUsage_Csmr_PlayOrPause:
+                // Aluminum Remote: Play/Pause
+                buttonCode = (kHIDRemoteButtonCodePlay|kHIDRemoteButtonCodeAluminumMask);
+                break;
+
+            case kHIDUsage_Csmr_Rewind:
+                buttonCode = kHIDRemoteButtonCodeLeftHold;
+                break;
+
+            case kHIDUsage_Csmr_FastForward:
+                buttonCode = kHIDRemoteButtonCodeRightHold;
+                break;
+
+            case kHIDUsage_Csmr_Menu:
+                buttonCode = kHIDRemoteButtonCodeMenuHold;
+                break;
+        }
+            break;
+
+        case kHIDPage_GenericDesktop:
+            switch (usage)
+        {
+            case kHIDUsage_GD_SystemAppMenu:
+                buttonCode = kHIDRemoteButtonCodeMenu;
+                break;
+
+            case kHIDUsage_GD_SystemMenu:
+                buttonCode = kHIDRemoteButtonCodeCenter;
+                break;
+
+            case kHIDUsage_GD_SystemMenuRight:
+                buttonCode = kHIDRemoteButtonCodeRight;
+                break;
+
+            case kHIDUsage_GD_SystemMenuLeft:
+                buttonCode = kHIDRemoteButtonCodeLeft;
+                break;
+
+            case kHIDUsage_GD_SystemMenuUp:
+                buttonCode = kHIDRemoteButtonCodeUp;
+                break;
+
+            case kHIDUsage_GD_SystemMenuDown:
+                buttonCode = kHIDRemoteButtonCodeDown;
+                break;
+        }
+            break;
+
+        case 0x06: /* Reserved */
+            switch (usage)
+        {
+            case 0x22:
+                buttonCode = kHIDRemoteButtonCodeIDChanged;
+                break;
+        }
+            break;
+
+        case 0xFF01: /* Vendor specific */
+            switch (usage)
+        {
+            case 0x23:
+                buttonCode = kHIDRemoteButtonCodeCenterHold;
+                break;
+
+#ifdef _HIDREMOTE_EXTENSIONS
+#define _HIDREMOTE_EXTENSIONS_SECTION 2
+#include "HIDRemoteAdditions.h"
+#undef _HIDREMOTE_EXTENSIONS_SECTION
+#endif /* _HIDREMOTE_EXTENSIONS */
+        }
+            break;
+    }
+
+    return (buttonCode);
+}
+
+- (BOOL)_setupService:(io_object_t)service
+{
+    kern_return_t        kernResult;
+    IOReturn         returnCode;
+    HRESULT          hResult;
+    SInt32           score;
+    BOOL             opened = NO, queueStarted = NO;
+    IOHIDDeviceInterface122  **hidDeviceInterface   = NULL;
+    IOCFPlugInInterface  **cfPluginInterface    = NULL;
+    IOHIDQueueInterface  **hidQueueInterface    = NULL;
+    io_object_t      serviceNotification    = 0;
+    CFRunLoopSourceRef   queueEventSource   = NULL;
+    NSMutableDictionary  *hidAttribsDict    = nil;
+    CFArrayRef       hidElements        = NULL;
+    NSError          *error         = nil;
+    UInt32           errorCode      = 0;
+
+    if (![self _prematchService:service])
+    {
+        return (NO);
+    }
+
+    do
+    {
+        // Create a plugin interface ..
+        kernResult = IOCreatePlugInInterfaceForService( service,
+                                                       kIOHIDDeviceUserClientTypeID,
+                                                       kIOCFPlugInInterfaceID,
+                                                       &cfPluginInterface,
+                                                       &score);
+
+        if (kernResult != kIOReturnSuccess)
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:kernResult userInfo:nil];
+            errorCode = 1;
+            break;
+        }
+
+
+        // .. use it to get the HID interface ..
+        hResult = (*cfPluginInterface)->QueryInterface( cfPluginInterface,
+                                                       CFUUIDGetUUIDBytes(kIOHIDDeviceInterfaceID122),
+                                                       (LPVOID)&hidDeviceInterface);
+
+        if ((hResult!=S_OK) || (hidDeviceInterface==NULL))
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:hResult userInfo:nil];
+            errorCode = 2;
+            break;
+        }
+
+
+        // .. then open it ..
+        switch (_mode)
+        {
+            case kHIDRemoteModeShared:
+                hResult = (*hidDeviceInterface)->open(hidDeviceInterface, kIOHIDOptionsTypeNone);
+                break;
+
+            case kHIDRemoteModeExclusive:
+            case kHIDRemoteModeExclusiveAuto:
+                hResult = (*hidDeviceInterface)->open(hidDeviceInterface, kIOHIDOptionsTypeSeizeDevice);
+                break;
+
+            default:
+                goto cleanUp; // Ugh! But there are no "double breaks" available in C AFAIK ..
+                break;
+        }
+
+        if (hResult!=S_OK)
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:hResult userInfo:nil];
+            errorCode = 3;
+            break;
+        }
+
+        opened = YES;
+
+        // .. query the HID elements ..
+        returnCode = (*hidDeviceInterface)->copyMatchingElements(hidDeviceInterface,
+                                                                 NULL,
+                                                                 &hidElements);
+        if ((returnCode != kIOReturnSuccess) || (hidElements==NULL))
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:returnCode userInfo:nil];
+            errorCode = 4;
+
+            break;
+        }
+
+        // Setup an event queue for HID events!
+        hidQueueInterface = (*hidDeviceInterface)->allocQueue(hidDeviceInterface);
+        if (hidQueueInterface == NULL)
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:kIOReturnError userInfo:nil];
+            errorCode = 5;
+
+            break;
+        }
+
+        returnCode = (*hidQueueInterface)->create(hidQueueInterface, 0, 32);
+        if (returnCode != kIOReturnSuccess)
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:returnCode userInfo:nil];
+            errorCode = 6;
+
+            break;
+        }
+
+
+        // Setup of attributes stored for this HID device
+        hidAttribsDict = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
+                          [NSValue valueWithPointer:(const void *)cfPluginInterface],   kHIDRemoteCFPluginInterface,
+                          [NSValue valueWithPointer:(const void *)hidDeviceInterface],  kHIDRemoteHIDDeviceInterface,
+                          [NSValue valueWithPointer:(const void *)hidQueueInterface],   kHIDRemoteHIDQueueInterface,
+                          nil];
+
+        {
+            UInt32 i, hidElementCnt = (unsigned)CFArrayGetCount(hidElements);
+            NSMutableDictionary *cookieButtonCodeLUT = [[NSMutableDictionary alloc] init];
+            NSMutableDictionary *cookieCount    = [[NSMutableDictionary alloc] init];
+
+            if ((cookieButtonCodeLUT==nil) || (cookieCount==nil))
+            {
+                cookieButtonCodeLUT = nil;
+                cookieCount = nil;
+
+                error = [NSError errorWithDomain:NSMachErrorDomain code:kIOReturnError userInfo:nil];
+                errorCode = 7;
+
+                break;
+            }
+
+            // Analyze the HID elements and find matching elements
+            for (i=0;i<hidElementCnt;i++)
+            {
+                CFDictionaryRef     hidDict;
+                NSNumber        *usage, *usagePage, *cookie;
+                HIDRemoteButtonCode buttonCode = kHIDRemoteButtonCodeNone;
+
+                hidDict = CFArrayGetValueAtIndex(hidElements, i);
+
+                usage     = (__bridge NSNumber *) CFDictionaryGetValue(hidDict, CFSTR(kIOHIDElementUsageKey));
+                usagePage = (__bridge NSNumber *) CFDictionaryGetValue(hidDict, CFSTR(kIOHIDElementUsagePageKey));
+                cookie    = (__bridge NSNumber *) CFDictionaryGetValue(hidDict, CFSTR(kIOHIDElementCookieKey));
+
+                if ((usage!=nil) && (usagePage!=nil) && (cookie!=nil))
+                {
+                    // Find the button codes for the ID combos
+                    buttonCode = [self buttonCodeForUsage:[usage unsignedIntValue] usagePage:[usagePage unsignedIntValue]];
+
+#ifdef _HIDREMOTE_EXTENSIONS
+                    // Debug logging code
+#define _HIDREMOTE_EXTENSIONS_SECTION 3
+#include "HIDRemoteAdditions.h"
+#undef _HIDREMOTE_EXTENSIONS_SECTION
+#endif /* _HIDREMOTE_EXTENSIONS */
+
+                    // Did record match?
+                    if (buttonCode != kHIDRemoteButtonCodeNone)
+                    {
+                        NSString *pairString        = [[NSString alloc] initWithFormat:@"%u_%u", [usagePage unsignedIntValue], [usage unsignedIntValue]];
+                        NSNumber *buttonCodeNumber  = @((unsigned int)buttonCode);
+
+#ifdef _HIDREMOTE_EXTENSIONS
+                        // Debug logging code
+#define _HIDREMOTE_EXTENSIONS_SECTION 4
+#include "HIDRemoteAdditions.h"
+#undef _HIDREMOTE_EXTENSIONS_SECTION
+#endif /* _HIDREMOTE_EXTENSIONS */
+
+                        cookieCount[pairString] = buttonCodeNumber;
+                        cookieButtonCodeLUT[cookie] = buttonCodeNumber;
+
+                        (*hidQueueInterface)->addElement(hidQueueInterface,
+                                                         (IOHIDElementCookie) [cookie unsignedIntValue],
+                                                         0);
+
+#ifdef _HIDREMOTE_EXTENSIONS
+                        // Get current apple Remote ID value
+#define _HIDREMOTE_EXTENSIONS_SECTION 7
+#include "HIDRemoteAdditions.h"
+#undef _HIDREMOTE_EXTENSIONS_SECTION
+#endif /* _HIDREMOTE_EXTENSIONS */
+                    }
+                }
+            }
+
+            // Compare number of *unique* matches (thus the cookieCount dictionary) with required minimum
+            if ([cookieCount count] < 10)
+            {
+                cookieButtonCodeLUT = nil;
+                cookieCount = nil;
+
+                error = [NSError errorWithDomain:NSMachErrorDomain code:kIOReturnError userInfo:nil];
+                errorCode = 8;
+
+                break;
+            }
+
+            hidAttribsDict[kHIDRemoteCookieButtonCodeLUT] = cookieButtonCodeLUT;
+
+            cookieButtonCodeLUT = nil;
+            cookieCount = nil;
+        }
+
+        // Finish setup of IOHIDQueueInterface with CFRunLoop
+        returnCode = (*hidQueueInterface)->createAsyncEventSource(hidQueueInterface, &queueEventSource);
+        if ((returnCode != kIOReturnSuccess) || (queueEventSource == NULL))
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:returnCode userInfo:nil];
+            errorCode = 9;
+            break;
+        }
+
+        returnCode = (*hidQueueInterface)->setEventCallout(hidQueueInterface, HIDEventCallback, (void *)((intptr_t)service), (__bridge void *)self);
+        if (returnCode != kIOReturnSuccess)
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:returnCode userInfo:nil];
+            errorCode = 10;
+            break;
+        }
+
+        CFRunLoopAddSource( CFRunLoopGetCurrent(),
+                           queueEventSource,
+                           kCFRunLoopCommonModes);
+        hidAttribsDict[kHIDRemoteCFRunLoopSource] = [NSValue valueWithPointer:(const void *)queueEventSource];
+
+        returnCode = (*hidQueueInterface)->start(hidQueueInterface);
+        if (returnCode != kIOReturnSuccess)
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:returnCode userInfo:nil];
+            errorCode = 11;
+            break;
+        }
+
+        queueStarted = YES;
+
+        // Setup device notifications
+        returnCode = IOServiceAddInterestNotification(_notifyPort,
+                                                      service,
+                                                      kIOGeneralInterest,
+                                                      ServiceNotificationCallback,
+                                                      (__bridge void *)self,
+                                                      &serviceNotification);
+        if ((returnCode != kIOReturnSuccess) || (serviceNotification==0))
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:returnCode userInfo:nil];
+            errorCode = 12;
+            break;
+        }
+
+        hidAttribsDict[kHIDRemoteServiceNotification] = @((unsigned int)serviceNotification);
+
+        // Retain service
+        if (IOObjectRetain(service) != kIOReturnSuccess)
+        {
+            error = [NSError errorWithDomain:NSMachErrorDomain code:kIOReturnError userInfo:nil];
+            errorCode = 13;
+            break;
+        }
+
+        hidAttribsDict[kHIDRemoteService] = @((unsigned int)service);
+
+        // Get some (somewhat optional) infos on the device
+        {
+            CFStringRef product, manufacturer, transport;
+
+            if ((product = IORegistryEntryCreateCFProperty( (io_registry_entry_t)service,
+                                                           (CFStringRef) @"Product",
+                                                           kCFAllocatorDefault,
+                                                           0)) != NULL)
+            {
+                if (CFGetTypeID(product) == CFStringGetTypeID())
+                {
+                    hidAttribsDict[kHIDRemoteProduct] = (__bridge_transfer NSString *)product;
+                }
+                else
+                {
+                    CFRelease(product);
+                }
+            }
+
+            if ((manufacturer = IORegistryEntryCreateCFProperty(    (io_registry_entry_t)service,
+                                                                (CFStringRef) @"Manufacturer",
+                                                                kCFAllocatorDefault,
+                                                                0)) != NULL)
+            {
+                if (CFGetTypeID(manufacturer) == CFStringGetTypeID())
+                {
+                    hidAttribsDict[kHIDRemoteManufacturer] = (__bridge_transfer NSString *)manufacturer;
+                }
+                else
+                {
+                    CFRelease(manufacturer);
+                }
+            }
+
+            if ((transport = IORegistryEntryCreateCFProperty(   (io_registry_entry_t)service,
+                                                             (CFStringRef) @"Transport",
+                                                             kCFAllocatorDefault,
+                                                             0)) != NULL)
+            {
+                if (CFGetTypeID(transport) == CFStringGetTypeID())
+                {
+                    hidAttribsDict[kHIDRemoteTransport] = (__bridge_transfer NSString *)transport;
+                }
+                else
+                {
+                    CFRelease(transport);
+                }
+            }
+        }
+
+        // Determine Aluminum Remote support
+        {
+            CFNumberRef aluSupport;
+            HIDRemoteAluminumRemoteSupportLevel supportLevel = kHIDRemoteAluminumRemoteSupportLevelNone;
+
+            if ((_mode == kHIDRemoteModeExclusive) || (_mode == kHIDRemoteModeExclusiveAuto))
+            {
+                // Determine if this driver offers on-demand support for the Aluminum Remote (only relevant under OS versions < 10.6.2)
+                if ((aluSupport = IORegistryEntryCreateCFProperty((io_registry_entry_t)service,
+                                                                  (CFStringRef) @"AluminumRemoteSupportLevelOnDemand",
+                                                                  kCFAllocatorDefault,
+                                                                  0)) != nil)
+                {
+                    // There is => request the driver to enable it for us
+                    if (IORegistryEntrySetCFProperty((io_registry_entry_t)service,
+                                                     CFSTR("EnableAluminumRemoteSupportForMe"),
+                                                     (__bridge void *)@{@"pid": @((long long)getpid()),
+                                                      @"uid": @((long long)getuid())}) == kIOReturnSuccess)
+                    {
+                        if (CFGetTypeID(aluSupport) == CFNumberGetTypeID())
+                        {
+                            supportLevel = (HIDRemoteAluminumRemoteSupportLevel) [(__bridge_transfer NSNumber *)aluSupport intValue];
+                        }
+                        else
+                        {
+                            CFRelease(aluSupport);
+                        }
+
+                        hidAttribsDict[kHIDRemoteAluminumRemoteSupportOnDemand] = @YES;
+                    }
+                    else
+                    {
+                        CFRelease(aluSupport);
+                    }
+                }
+            }
+
+            if (supportLevel == kHIDRemoteAluminumRemoteSupportLevelNone)
+            {
+                if ((aluSupport = IORegistryEntryCreateCFProperty((io_registry_entry_t)service,
+                                                                  (CFStringRef) @"AluminumRemoteSupportLevel",
+                                                                  kCFAllocatorDefault,
+                                                                  0)) != nil)
+                {
+                    if (CFGetTypeID(aluSupport) == CFNumberGetTypeID())
+                    {
+                        supportLevel = (HIDRemoteAluminumRemoteSupportLevel) [(__bridge_transfer NSNumber *)aluSupport intValue];
+                    }
+                    else
+                    {
+                        CFRelease(aluSupport);
+                    }
+                }
+                else
+                {
+                    CFStringRef ioKitClassName;
+
+                    if ((ioKitClassName = IORegistryEntryCreateCFProperty(  (io_registry_entry_t)service,
+                                                                          CFSTR(kIOClassKey),
+                                                                          kCFAllocatorDefault,
+                                                                          0)) != nil)
+                    {
+                        if ([(__bridge_transfer NSString *)ioKitClassName isEqual:@"AppleIRController"])
+                        {
+                          supportLevel = kHIDRemoteAluminumRemoteSupportLevelNative;
+                        }
+                    }
+                }
+            }
+
+            hidAttribsDict[kHIDRemoteAluminumRemoteSupportLevel] = (NSNumber *)@((int)supportLevel);
+        }
+
+        // Add it to the serviceAttribMap
+        _serviceAttribMap[@((unsigned int)service)] = hidAttribsDict;
+
+        // And we're done with setup ..
+        if (([self delegate]!=nil) &&
+            ([[self delegate] respondsToSelector:@selector(hidRemote:foundNewHardwareWithAttributes:)]))
+        {
+            [((NSObject <HIDRemoteDelegate> *)[self delegate]) hidRemote:self foundNewHardwareWithAttributes:hidAttribsDict];
+        }
+
+        hidAttribsDict = nil;
+
+        return(YES);
+
+    }while(0);
+
+cleanUp:
+
+    if (([self delegate]!=nil) &&
+        ([[self delegate] respondsToSelector:@selector(hidRemote:failedNewHardwareWithError:)]))
+    {
+        if (error!=nil)
+        {
+            error = [NSError errorWithDomain:[error domain]
+                                        code:[error code]
+                                    userInfo:@{@"InternalErrorCode": [NSNumber numberWithInt:errorCode]}
+                     ];
+        }
+
+        [((NSObject <HIDRemoteDelegate> *)[self delegate]) hidRemote:self failedNewHardwareWithError:error];
+    }
+
+    // An error occured or this device is not of interest .. cleanup ..
+    if (serviceNotification!=0)
+    {
+        IOObjectRelease(serviceNotification);
+        serviceNotification = 0;
+    }
+
+    if (queueEventSource!=NULL)
+    {
+        CFRunLoopSourceInvalidate(queueEventSource);
+        queueEventSource=NULL;
+    }
+
+    if (hidQueueInterface!=NULL)
+    {
+        if (queueStarted)
+        {
+            (*hidQueueInterface)->stop(hidQueueInterface);
+        }
+        (*hidQueueInterface)->dispose(hidQueueInterface);
+        (*hidQueueInterface)->Release(hidQueueInterface);
+        hidQueueInterface = NULL;
+    }
+
+    hidAttribsDict = nil;
+
+    if (hidElements!=NULL)
+    {
+        CFRelease(hidElements);
+        hidElements = NULL;
+    }
+
+    if (hidDeviceInterface!=NULL)
+    {
+        if (opened)
+        {
+            (*hidDeviceInterface)->close(hidDeviceInterface);
+        }
+        (*hidDeviceInterface)->Release(hidDeviceInterface);
+        // opened = NO;
+        hidDeviceInterface = NULL;
+    }
+
+    if (cfPluginInterface!=NULL)
+    {
+        IODestroyPlugInInterface(cfPluginInterface);
+        cfPluginInterface = NULL;
+    }
+
+    return (NO);
+}
+
+- (void)_destructService:(io_object_t)service
+{
+    NSNumber        *serviceValue;
+    NSMutableDictionary *serviceDict = NULL;
+
+    if ((serviceValue = @((unsigned int)service)) == nil)
+    {
+        return;
+    }
+
+    serviceDict  = _serviceAttribMap[serviceValue];
+
+    if (serviceDict!=nil)
+    {
+        IOHIDDeviceInterface122  **hidDeviceInterface   = NULL;
+        IOCFPlugInInterface  **cfPluginInterface    = NULL;
+        IOHIDQueueInterface  **hidQueueInterface    = NULL;
+        io_object_t      serviceNotification    = 0;
+        CFRunLoopSourceRef   queueEventSource   = NULL;
+        io_object_t      theService     = 0;
+        NSMutableDictionary  *cookieButtonMap   = nil;
+        NSTimer          *simulateHoldTimer = nil;
+
+        serviceNotification = (io_object_t)         (serviceDict[kHIDRemoteServiceNotification]   ? [serviceDict[kHIDRemoteServiceNotification] unsignedIntValue] :   0);
+        theService      = (io_object_t)         (serviceDict[kHIDRemoteService]           ? [serviceDict[kHIDRemoteService]         unsignedIntValue] :   0);
+        queueEventSource    = (CFRunLoopSourceRef)      (serviceDict[kHIDRemoteCFRunLoopSource]       ? [serviceDict[kHIDRemoteCFRunLoopSource]     pointerValue]     : NULL);
+        hidQueueInterface   = (IOHIDQueueInterface **)      (serviceDict[kHIDRemoteHIDQueueInterface]     ? [serviceDict[kHIDRemoteHIDQueueInterface]   pointerValue]     : NULL);
+        hidDeviceInterface  = (IOHIDDeviceInterface122 **)  (serviceDict[kHIDRemoteHIDDeviceInterface]    ? [serviceDict[kHIDRemoteHIDDeviceInterface]  pointerValue]     : NULL);
+        cfPluginInterface   = (IOCFPlugInInterface **)      (serviceDict[kHIDRemoteCFPluginInterface]     ? [serviceDict[kHIDRemoteCFPluginInterface]   pointerValue]     : NULL);
+        cookieButtonMap     = (NSMutableDictionary *)        serviceDict[kHIDRemoteCookieButtonCodeLUT];
+        simulateHoldTimer   = (NSTimer *)            serviceDict[kHIDRemoteSimulateHoldEventsTimer];
+
+        [_serviceAttribMap removeObjectForKey:serviceValue];
+
+        if ((serviceDict[kHIDRemoteAluminumRemoteSupportOnDemand]!=nil) && [serviceDict[kHIDRemoteAluminumRemoteSupportOnDemand] boolValue] && (theService != 0))
+        {
+            // We previously requested the driver to enable Aluminum Remote support for us. Tell it to turn it off again - now that we no longer need it
+            IORegistryEntrySetCFProperty((io_registry_entry_t)theService,
+                                         CFSTR("DisableAluminumRemoteSupportForMe"),
+                                         (__bridge void *)@{@"pid": @((long long)getpid()),
+                                          @"uid": @((long long)getuid())});
+        }
+
+        if (([self delegate]!=nil) &&
+            ([[self delegate] respondsToSelector:@selector(hidRemote:releasedHardwareWithAttributes:)]))
+        {
+            [((NSObject <HIDRemoteDelegate> *)[self delegate]) hidRemote:self releasedHardwareWithAttributes:serviceDict];
+        }
+
+        if (simulateHoldTimer!=nil)
+        {
+            [simulateHoldTimer invalidate];
+        }
+
+        if (serviceNotification!=0)
+        {
+            IOObjectRelease(serviceNotification);
+        }
+
+        if (queueEventSource!=NULL)
+        {
+            CFRunLoopRemoveSource(  CFRunLoopGetCurrent(),
+                                  queueEventSource,
+                                  kCFRunLoopCommonModes);
+        }
+
+        if ((hidQueueInterface!=NULL) && (cookieButtonMap!=nil))
+        {
+            for (NSNumber *cookie in [cookieButtonMap keyEnumerator])
+            {
+                if ((*hidQueueInterface)->hasElement(hidQueueInterface, (IOHIDElementCookie) [cookie unsignedIntValue]))
+                {
+                    (*hidQueueInterface)->removeElement(hidQueueInterface,
+                                                        (IOHIDElementCookie) [cookie unsignedIntValue]);
+                }
+            };
+        }
+
+        if (hidQueueInterface!=NULL)
+        {
+            (*hidQueueInterface)->stop(hidQueueInterface);
+            (*hidQueueInterface)->dispose(hidQueueInterface);
+            (*hidQueueInterface)->Release(hidQueueInterface);
+        }
+
+        if (hidDeviceInterface!=NULL)
+        {
+            (*hidDeviceInterface)->close(hidDeviceInterface);
+            (*hidDeviceInterface)->Release(hidDeviceInterface);
+        }
+
+        if (cfPluginInterface!=NULL)
+        {
+            IODestroyPlugInInterface(cfPluginInterface);
+        }
+
+        if (theService!=0)
+        {
+            IOObjectRelease(theService);
+        }
+    }
+}
+
+
+#pragma mark -- PRIVATE: HID Event handling --
+- (void)_simulateHoldEvent:(NSTimer *)aTimer
+{
+    NSMutableDictionary *hidAttribsDict;
+    NSTimer  *shTimer;
+    NSNumber *shButtonCode;
+
+    if ((hidAttribsDict = (NSMutableDictionary *)[aTimer userInfo]) != nil)
+    {
+        if (((shTimer      = hidAttribsDict[kHIDRemoteSimulateHoldEventsTimer]) != nil) &&
+            ((shButtonCode = hidAttribsDict[kHIDRemoteSimulateHoldEventsOriginButtonCode]) != nil))
+        {
+            [shTimer invalidate];
+            [hidAttribsDict removeObjectForKey:kHIDRemoteSimulateHoldEventsTimer];
+
+            [self _sendButtonCode:(((HIDRemoteButtonCode)[shButtonCode unsignedIntValue])|kHIDRemoteButtonCodeHoldMask) isPressed:YES hidAttribsDict:hidAttribsDict];
+        }
+    }
+}
+
+- (void)_handleButtonCode:(HIDRemoteButtonCode)buttonCode isPressed:(BOOL)isPressed hidAttribsDict:(NSMutableDictionary *)hidAttribsDict
+{
+    switch (buttonCode)
+    {
+        case kHIDRemoteButtonCodeIDChanged:
+            // Do nothing, this is handled seperately
+            break;
+
+        case kHIDRemoteButtonCodeUp:
+        case kHIDRemoteButtonCodeDown:
+            if (_simulateHoldEvents)
+            {
+                NSTimer  *shTimer = nil;
+                NSNumber *shButtonCode = nil;
+
+                [hidAttribsDict[kHIDRemoteSimulateHoldEventsTimer] invalidate];
+
+                if (isPressed)
+                {
+                    hidAttribsDict[kHIDRemoteSimulateHoldEventsOriginButtonCode] = [NSNumber numberWithUnsignedInt:buttonCode];
+
+                    if ((shTimer = [[NSTimer alloc] initWithFireDate:[NSDate dateWithTimeIntervalSinceNow:0.7] interval:0.1 target:self selector:@selector(_simulateHoldEvent:) userInfo:hidAttribsDict repeats:NO]) != nil)
+                    {
+                        hidAttribsDict[kHIDRemoteSimulateHoldEventsTimer] = shTimer;
+
+                        [[NSRunLoop currentRunLoop] addTimer:shTimer forMode:NSRunLoopCommonModes];
+
+                        break;
+                    }
+                }
+                else
+                {
+                    shTimer      = hidAttribsDict[kHIDRemoteSimulateHoldEventsTimer];
+                    shButtonCode = hidAttribsDict[kHIDRemoteSimulateHoldEventsOriginButtonCode];
+
+                    if ((shTimer!=nil) && (shButtonCode!=nil))
+                    {
+                        [self _sendButtonCode:(HIDRemoteButtonCode)[shButtonCode unsignedIntValue] isPressed:YES hidAttribsDict:hidAttribsDict];
+                        [self _sendButtonCode:(HIDRemoteButtonCode)[shButtonCode unsignedIntValue] isPressed:NO hidAttribsDict:hidAttribsDict];
+                    }
+                    else
+                    {
+                        if (shButtonCode!=nil)
+                        {
+                            [self _sendButtonCode:(((HIDRemoteButtonCode)[shButtonCode unsignedIntValue])|kHIDRemoteButtonCodeHoldMask) isPressed:NO hidAttribsDict:hidAttribsDict];
+                        }
+                    }
+                }
+
+                [hidAttribsDict removeObjectForKey:kHIDRemoteSimulateHoldEventsTimer];
+                [hidAttribsDict removeObjectForKey:kHIDRemoteSimulateHoldEventsOriginButtonCode];
+
+                break;
+            }
+
+        default:
+            [self _sendButtonCode:buttonCode isPressed:isPressed hidAttribsDict:hidAttribsDict];
+            break;
+    }
+}
+
+- (void)_sendButtonCode:(HIDRemoteButtonCode)buttonCode isPressed:(BOOL)isPressed hidAttribsDict:(NSMutableDictionary *)hidAttribsDict
+{
+    if (([self delegate]!=nil) &&
+        ([[self delegate] respondsToSelector:@selector(hidRemote:eventWithButton:isPressed:fromHardwareWithAttributes:)]))
+    {
+        switch (buttonCode & (~kHIDRemoteButtonCodeAluminumMask))
+        {
+            case kHIDRemoteButtonCodePlay:
+            case kHIDRemoteButtonCodeCenter:
+                if (buttonCode & kHIDRemoteButtonCodeAluminumMask)
+                {
+                    _lastSeenModel         = kHIDRemoteModelAluminum;
+                    _lastSeenModelRemoteID = _lastSeenRemoteID;
+                }
+                else
+                {
+                    switch ((HIDRemoteAluminumRemoteSupportLevel)[hidAttribsDict[kHIDRemoteAluminumRemoteSupportLevel] intValue])
+                    {
+                        case kHIDRemoteAluminumRemoteSupportLevelNone:
+                        case kHIDRemoteAluminumRemoteSupportLevelEmulation:
+                            // Remote type can't be determined by just the Center button press
+                            break;
+
+                        case kHIDRemoteAluminumRemoteSupportLevelNative:
+                            // Remote type can be safely determined by just the Center button press
+                            if (((_lastSeenModel == kHIDRemoteModelAluminum) && (_lastSeenModelRemoteID != _lastSeenRemoteID)) ||
+                                (_lastSeenModel == kHIDRemoteModelUndetermined))
+                            {
+                                _lastSeenModel = kHIDRemoteModelWhitePlastic;
+                            }
+                            break;
+                    }
+                }
+                break;
+        }
+
+        // As soon as we have received a code that's unique to the Aluminum Remote, we can tell kHIDRemoteButtonCodePlayHold and kHIDRemoteButtonCodeCenterHold apart.
+        // Prior to that, a long press of the new "Play" button will be submitted as a "kHIDRemoteButtonCodeCenterHold", not a "kHIDRemoteButtonCodePlayHold" code.
+        if ((buttonCode == kHIDRemoteButtonCodeCenterHold) && (_lastSeenModel == kHIDRemoteModelAluminum))
+        {
+            buttonCode = kHIDRemoteButtonCodePlayHold;
+        }
+
+        [((NSObject <HIDRemoteDelegate> *)[self delegate]) hidRemote:self eventWithButton:(buttonCode & (~kHIDRemoteButtonCodeAluminumMask)) isPressed:isPressed fromHardwareWithAttributes:hidAttribsDict];
+    }
+}
+
+- (void)_hidEventFor:(io_service_t)hidDevice from:(IOHIDQueueInterface **)interface withResult:(IOReturn)result
+{
+    NSMutableDictionary *hidAttribsDict = _serviceAttribMap[@((unsigned int)hidDevice)];
+
+    if (hidAttribsDict!=nil)
+    {
+        IOHIDQueueInterface **queueInterface  = NULL;
+
+        queueInterface  = [hidAttribsDict[kHIDRemoteHIDQueueInterface] pointerValue];
+
+        if (interface == queueInterface)
+        {
+            NSNumber        *lastButtonPressedNumber = nil;
+            HIDRemoteButtonCode  lastButtonPressed = kHIDRemoteButtonCodeNone;
+            NSMutableDictionary *cookieButtonMap = nil;
+
+            cookieButtonMap  = hidAttribsDict[kHIDRemoteCookieButtonCodeLUT];
+
+            if ((lastButtonPressedNumber = hidAttribsDict[kHIDRemoteLastButtonPressed]) != nil)
+            {
+                lastButtonPressed = [lastButtonPressedNumber unsignedIntValue];
+            }
+
+            while (result == kIOReturnSuccess)
+            {
+                IOHIDEventStruct hidEvent;
+                AbsoluteTime supportedTime = { 0,0 };
+
+                result = (*queueInterface)->getNextEvent(   queueInterface,
+                                                         &hidEvent,
+                                                         supportedTime,
+                                                         0);
+
+                if (result == kIOReturnSuccess)
+                {
+                    NSNumber *buttonCodeNumber = cookieButtonMap[@((unsigned int) hidEvent.elementCookie)];
+
+#ifdef _HIDREMOTE_EXTENSIONS
+                    // Debug logging code
+#define _HIDREMOTE_EXTENSIONS_SECTION 5
+#include "HIDRemoteAdditions.h"
+#undef _HIDREMOTE_EXTENSIONS_SECTION
+#endif /* _HIDREMOTE_EXTENSIONS */
+
+                    if (buttonCodeNumber!=nil)
+                    {
+                        HIDRemoteButtonCode buttonCode = [buttonCodeNumber unsignedIntValue];
+
+                        if (hidEvent.value == 0)
+                        {
+                            if (buttonCode == lastButtonPressed)
+                            {
+                                [self _handleButtonCode:lastButtonPressed isPressed:NO hidAttribsDict:hidAttribsDict];
+                                lastButtonPressed = kHIDRemoteButtonCodeNone;
+                            }
+                        }
+
+                        if (hidEvent.value != 0)
+                        {
+                            if (lastButtonPressed != kHIDRemoteButtonCodeNone)
+                            {
+                                [self _handleButtonCode:lastButtonPressed isPressed:NO hidAttribsDict:hidAttribsDict];
+                                // lastButtonPressed = kHIDRemoteButtonCodeNone;
+                            }
+
+                            if (buttonCode == kHIDRemoteButtonCodeIDChanged)
+                            {
+                                if (([self delegate]!=nil) &&
+                                    ([[self delegate] respondsToSelector:@selector(hidRemote:remoteIDChangedOldID:newID:forHardwareWithAttributes:)]))
+                                {
+                                    [((NSObject <HIDRemoteDelegate> *)[self delegate]) hidRemote:self remoteIDChangedOldID:_lastSeenRemoteID newID:hidEvent.value forHardwareWithAttributes:hidAttribsDict];
+                                }
+
+                                _lastSeenRemoteID = hidEvent.value;
+                                _lastSeenModel    = kHIDRemoteModelUndetermined;
+                            }
+
+                            [self _handleButtonCode:buttonCode isPressed:YES hidAttribsDict:hidAttribsDict];
+                            lastButtonPressed = buttonCode;
+                        }
+                    }
+                }
+            };
+
+            hidAttribsDict[kHIDRemoteLastButtonPressed] = [NSNumber numberWithUnsignedInt:lastButtonPressed];
+        }
+
+#ifdef _HIDREMOTE_EXTENSIONS
+        // Debug logging code
+#define _HIDREMOTE_EXTENSIONS_SECTION 6
+#include "HIDRemoteAdditions.h"
+#undef _HIDREMOTE_EXTENSIONS_SECTION
+#endif /* _HIDREMOTE_EXTENSIONS */
+    }
+}
+
+#pragma mark -- PRIVATE: Notification handling --
+- (void)_serviceMatching:(io_iterator_t)iterator
+{
+    io_object_t matchingService = 0;
+
+    while ((matchingService = IOIteratorNext(iterator)) != 0)
+    {
+        [self _setupService:matchingService];
+
+        IOObjectRelease(matchingService);
+    };
+}
+
+- (void)_serviceNotificationFor:(io_service_t)service messageType:(natural_t)messageType messageArgument:(void *)messageArgument
+{
+    if (messageType == kIOMessageServiceIsTerminated)
+    {
+        [self _destructService:service];
+    }
+}
+
+- (void)_updateSessionInformation
+{
+    NSArray *consoleUsersArray;
+    io_service_t rootService;
+
+    if (_masterPort==0) { return; }
+
+    if ((rootService = IORegistryGetRootEntry(_masterPort)) != 0)
+    {
+        if ((consoleUsersArray = (__bridge_transfer NSArray *)IORegistryEntryCreateCFProperty((io_registry_entry_t)rootService, CFSTR("IOConsoleUsers"), kCFAllocatorDefault, 0)) != nil)
+        {
+            if ([consoleUsersArray isKindOfClass:[NSArray class]])  // Be careful - ensure this really is an array
+            {
+                UInt64 secureEventInputPIDSum = 0;
+                uid_t frontUserSession = 0;
+
+                for (NSDictionary *consoleUserDict in consoleUsersArray)
+                {
+                    if ([consoleUserDict isKindOfClass:[NSDictionary class]]) // Be careful - ensure this really is a dictionary
+                    {
+                        NSNumber *secureInputPID;
+                        NSNumber *onConsole;
+                        NSNumber *userID;
+
+                        if ((secureInputPID = consoleUserDict[@"kCGSSessionSecureInputPID"]) != nil)
+                        {
+                            if ([secureInputPID isKindOfClass:[NSNumber class]])
+                            {
+                                secureEventInputPIDSum += ((UInt64) [secureInputPID intValue]);
+                            }
+                        }
+
+                        if (((onConsole = consoleUserDict[@"kCGSSessionOnConsoleKey"]) != nil) &&
+                            ((userID    = consoleUserDict[@"kCGSSessionUserIDKey"]) != nil))
+                        {
+                            if ([onConsole isKindOfClass:[NSNumber class]] && [userID isKindOfClass:[NSNumber class]])
+                            {
+                                if ([onConsole boolValue])
+                                {
+                                    frontUserSession = (uid_t) [userID intValue];
+                                }
+                            }
+                        }
+                    }
+                }
+
+                _lastSecureEventInputPIDSum = secureEventInputPIDSum;
+                _lastFrontUserSession       = frontUserSession;
+            }
+        }
+
+        IOObjectRelease((io_object_t) rootService);
+    }
+}
+
+- (void)_secureInputNotificationFor:(io_service_t)service messageType:(natural_t)messageType messageArgument:(void *)messageArgument
+{
+    if (messageType == kIOMessageServiceBusyStateChange)
+    {
+        UInt64 old_lastSecureEventInputPIDSum = _lastSecureEventInputPIDSum;
+        uid_t  old_lastFrontUserSession = _lastFrontUserSession;
+
+        [self _updateSessionInformation];
+
+        if (((old_lastSecureEventInputPIDSum != _lastSecureEventInputPIDSum) || (old_lastFrontUserSession != _lastFrontUserSession)) && _secureEventInputWorkAround)
+        {
+            if ((_mode == kHIDRemoteModeExclusive) || (_mode == kHIDRemoteModeExclusiveAuto))
+            {
+                HIDRemoteMode restartInMode = _mode;
+
+                _isRestarting = YES;
+                [self stopRemoteControl];
+                [self startRemoteControl:restartInMode];
+                _isRestarting = NO;
+            }
+        }
+    }
+}
+
+@end
+
+#pragma mark -- PRIVATE: IOKitLib Callbacks --
+
+static void HIDEventCallback(   void * target,
+                             IOReturn result,
+                             void * refCon,
+                             void * sender)
+{
+    HIDRemote       *hidRemote = (__bridge HIDRemote *)refCon;
+
+    @autoreleasepool {
+        [hidRemote _hidEventFor:(io_service_t)((intptr_t)target) from:(IOHIDQueueInterface**)sender withResult:(IOReturn)result];
+    }
+}
+
+
+static void ServiceMatchingCallback(    void *refCon,
+                                    io_iterator_t iterator)
+{
+    HIDRemote       *hidRemote = (__bridge HIDRemote *)refCon;
+
+    @autoreleasepool {
+        [hidRemote _serviceMatching:iterator];
+    }
+}
+
+static void ServiceNotificationCallback(void *      refCon,
+                                        io_service_t    service,
+                                        natural_t   messageType,
+                                        void *      messageArgument)
+{
+    HIDRemote       *hidRemote = (__bridge HIDRemote *)refCon;
+
+    @autoreleasepool {
+        [hidRemote _serviceNotificationFor:service
+                               messageType:messageType
+                           messageArgument:messageArgument];
+    }
+}
+
+static void SecureInputNotificationCallback(    void *      refCon,
+                                            io_service_t    service,
+                                            natural_t   messageType,
+                                            void *      messageArgument)
+{
+    HIDRemote       *hidRemote = (__bridge HIDRemote *)refCon;
+
+    @autoreleasepool {
+        [hidRemote _secureInputNotificationFor:service
+                                   messageType:messageType
+                               messageArgument:messageArgument];
+    }
+}
+
+// Attribute dictionary keys
+NSString *kHIDRemoteCFPluginInterface           = @"CFPluginInterface";
+NSString *kHIDRemoteHIDDeviceInterface          = @"HIDDeviceInterface";
+NSString *kHIDRemoteCookieButtonCodeLUT         = @"CookieButtonCodeLUT";
+NSString *kHIDRemoteHIDQueueInterface           = @"HIDQueueInterface";
+NSString *kHIDRemoteServiceNotification         = @"ServiceNotification";
+NSString *kHIDRemoteCFRunLoopSource         = @"CFRunLoopSource";
+NSString *kHIDRemoteLastButtonPressed           = @"LastButtonPressed";
+NSString *kHIDRemoteService             = @"Service";
+NSString *kHIDRemoteSimulateHoldEventsTimer     = @"SimulateHoldEventsTimer";
+NSString *kHIDRemoteSimulateHoldEventsOriginButtonCode  = @"SimulateHoldEventsOriginButtonCode";
+NSString *kHIDRemoteAluminumRemoteSupportLevel      = @"AluminumRemoteSupportLevel";
+NSString *kHIDRemoteAluminumRemoteSupportOnDemand   = @"AluminumRemoteSupportLevelOnDemand";
+
+NSString *kHIDRemoteManufacturer            = @"Manufacturer";
+NSString *kHIDRemoteProduct             = @"Product";
+NSString *kHIDRemoteTransport               = @"Transport";
+
+// Distributed notifications
+NSString *kHIDRemoteDNHIDRemotePing         = @"com.candelair.ping";
+NSString *kHIDRemoteDNHIDRemoteRetry            = @"com.candelair.retry";
+NSString *kHIDRemoteDNHIDRemoteStatus           = @"com.candelair.status";
+
+NSString *kHIDRemoteDNHIDRemoteRetryGlobalObject    = @"global";
+
+// Distributed notifications userInfo keys and values
+NSString *kHIDRemoteDNStatusHIDRemoteVersionKey     = @"HIDRemoteVersion";
+NSString *kHIDRemoteDNStatusPIDKey          = @"PID";
+NSString *kHIDRemoteDNStatusModeKey         = @"Mode";
+NSString *kHIDRemoteDNStatusUnusedButtonCodesKey    = @"UnusedButtonCodes";
+NSString *kHIDRemoteDNStatusActionKey           = @"Action";
+NSString *kHIDRemoteDNStatusRemoteControlCountKey   = @"RemoteControlCount";
+NSString *kHIDRemoteDNStatusReturnToPIDKey      = @"ReturnToPID";
+NSString *kHIDRemoteDNStatusActionStart         = @"start";
+NSString *kHIDRemoteDNStatusActionStop          = @"stop";
+NSString *kHIDRemoteDNStatusActionUpdate        = @"update";
+NSString *kHIDRemoteDNStatusActionNoNeed        = @"noneed";
diff --git a/src/input/apple/HIDRemote/LICENSE.txt b/src/input/apple/HIDRemote/LICENSE.txt
new file mode 100644
index 0000000..0a6695c
--- /dev/null
+++ b/src/input/apple/HIDRemote/LICENSE.txt
@@ -0,0 +1,27 @@
+Copyright (c) 2007-2011 IOSPIRIT GmbH (http://www.iospirit.com/)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list
+  of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of IOSPIRIT GmbH nor the names of its contributors may be used to
+  endorse or promote products derived from this software without specific prior
+  written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
\ No newline at end of file
diff --git a/src/input/apple/HIDRemote/README.txt b/src/input/apple/HIDRemote/README.txt
new file mode 100644
index 0000000..36ddafb
--- /dev/null
+++ b/src/input/apple/HIDRemote/README.txt
@@ -0,0 +1,18 @@
+README FOR HIDREMOTE SDK
+========================
+
+HIDRemote
+---------
+Contains the HIDRemote class. For the latest version of this class and
+documentation, please visit http://www.iospirit.com/developers/hidremote/
+
+
+Example
+-------
+Contains a sample application showing the use of HIDRemote class. 
+
+
+Documentation
+-------------
+Please visit http://www.iospirit.com/developers/hidremote/ for a guide
+and documentation.
diff --git a/src/input/apple/InputAppleMediaKeys.h b/src/input/apple/InputAppleMediaKeys.h
new file mode 100644
index 0000000..5b6d442
--- /dev/null
+++ b/src/input/apple/InputAppleMediaKeys.h
@@ -0,0 +1,22 @@
+//
+// Created by Tobias Hieta on 21/08/15.
+//
+
+#ifndef KONVERGO_INPUTAPPLEMEDIAKEYS_H
+#define KONVERGO_INPUTAPPLEMEDIAKEYS_H
+
+#include "input/InputComponent.h"
+
+class InputAppleMediaKeys : public InputBase
+{
+  Q_OBJECT
+public:
+  InputAppleMediaKeys(QObject* parent = 0) : InputBase(parent) { }
+  bool initInput();
+  const char* inputName() { return "AppleMediaKeys"; }
+
+private:
+  void* m_delegate;
+};
+
+#endif //KONVERGO_INPUTAPPLEMEDIAKEYS_H
diff --git a/src/input/apple/InputAppleMediaKeys.mm b/src/input/apple/InputAppleMediaKeys.mm
new file mode 100644
index 0000000..917dacc
--- /dev/null
+++ b/src/input/apple/InputAppleMediaKeys.mm
@@ -0,0 +1,74 @@
+//
+// Created by Tobias Hieta on 21/08/15.
+//
+
+#include "InputAppleMediaKeys.h"
+#include "SPMediaKeyTap.h"
+#include "QsLog.h"
+
+@interface MediaKeysDelegate : NSObject
+{
+  SPMediaKeyTap* keyTap;
+  InputAppleMediaKeys* m_input;
+}
+-(instancetype)initWithInput:(InputAppleMediaKeys*)input;
+@end
+
+@implementation MediaKeysDelegate
+
+- (instancetype)initWithInput:(InputAppleMediaKeys*)input
+{
+  self = [super init];
+  if (self) {
+    m_input = input;
+    keyTap = [[SPMediaKeyTap alloc] initWithDelegate:self];
+    if ([SPMediaKeyTap usesGlobalMediaKeyTap])
+      [keyTap startWatchingMediaKeys];
+    else
+      QLOG_WARN() << "Could not grab global media keys";
+  }
+  return self;
+}
+
+-(void)mediaKeyTap:(SPMediaKeyTap *)keyTap receivedMediaKeyEvent:(NSEvent *)event
+{
+  int keyCode = (([event data1] & 0xFFFF0000) >> 16);
+  int keyFlags = ([event data1] & 0x0000FFFF);
+  BOOL keyIsPressed = (((keyFlags & 0xFF00) >> 8)) == 0xA;
+
+  QString keyPressed;
+
+  if (keyIsPressed) {
+    switch (keyCode) {
+      case NX_KEYTYPE_PLAY:
+        keyPressed = INPUT_KEY_PLAY;
+        break;
+      case NX_KEYTYPE_FAST:
+        keyPressed = "KEY_FAST";
+        break;
+      case NX_KEYTYPE_REWIND:
+        keyPressed = "KEY_REWIND";
+        break;
+      case NX_KEYTYPE_NEXT:
+        keyPressed = INPUT_KEY_NEXT;
+        break;
+      case NX_KEYTYPE_PREVIOUS:
+        keyPressed = INPUT_KEY_PREV;
+        break;
+      default:
+        break;
+        // More cases defined in hidsystem/ev_keymap.h
+    }
+
+    emit m_input->receivedInput("AppleMediaKeys", keyPressed);
+  }
+}
+
+@end
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputAppleMediaKeys::initInput()
+{
+  m_delegate = [[MediaKeysDelegate alloc] initWithInput:this];
+  return true;
+}
\ No newline at end of file
diff --git a/src/input/apple/InputAppleRemote.h b/src/input/apple/InputAppleRemote.h
new file mode 100644
index 0000000..b094b7e
--- /dev/null
+++ b/src/input/apple/InputAppleRemote.h
@@ -0,0 +1,35 @@
+#ifndef __INPUT_APPLE_REMOTE_H__
+#define __INPUT_APPLE_REMOTE_H__
+
+#include <QObject>
+#include <QString>
+#include "input/InputComponent.h"
+
+
+#ifdef __OBJC__
+@class AppleRemoteDelegate;
+typedef AppleRemoteDelegate delegate;
+#else
+typedef void delegate;
+#endif
+
+class InputAppleRemote : public InputBase
+{
+public:
+  InputAppleRemote(QObject* parent = 0) : InputBase(parent) { }
+  virtual const char* inputName() { return "AppleRemote"; }
+  virtual bool initInput();
+  
+  void remoteButtonEvent(quint8 code, bool pressed, const QString& name);
+  
+  void addRemote(const QString& name);
+  void removeRemote(const QString& name);
+  void addRemoteFailed(const QString& error);
+  
+private:
+  delegate* m_delegate;
+  QStringList m_remotes;
+  
+};
+
+#endif
\ No newline at end of file
diff --git a/src/input/apple/InputAppleRemote.mm b/src/input/apple/InputAppleRemote.mm
new file mode 100644
index 0000000..93033fb
--- /dev/null
+++ b/src/input/apple/InputAppleRemote.mm
@@ -0,0 +1,85 @@
+#include "InputAppleRemote.h"
+#include "QsLog.h"
+
+#include "HIDRemote/HIDRemote.h"
+#include "AppleRemoteDelegate.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool InputAppleRemote::initInput()
+{
+  m_delegate = [[AppleRemoteDelegate alloc] initWithRemoteHandler:this];
+  return [m_delegate setupRemote];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputAppleRemote::addRemoteFailed(const QString &error)
+{
+  QLOG_ERROR() << error;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputAppleRemote::addRemote(const QString &name)
+{
+  m_remotes << name;
+  QLOG_DEBUG() << "Added remote:" << name;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputAppleRemote::removeRemote(const QString &name)
+{
+  m_remotes.removeOne(name);
+  QLOG_DEBUG() << "Remove remote:" << name;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static QString codeToString(HIDRemoteButtonCode code)
+{
+  switch (code)
+  {
+    case kHIDRemoteButtonCodeCenter:
+      return INPUT_KEY_SELECT;
+    case kHIDRemoteButtonCodeCenterHold:
+      return INPUT_KEY_SELECT_LONG;
+    case kHIDRemoteButtonCodeDown:
+      return INPUT_KEY_DOWN;
+    case kHIDRemoteButtonCodeDownHold:
+      return INPUT_KEY_DOWN_LONG;
+    case kHIDRemoteButtonCodeLeft:
+      return INPUT_KEY_LEFT;
+    case kHIDRemoteButtonCodeLeftHold:
+      return INPUT_KEY_LEFT_LONG;
+    case kHIDRemoteButtonCodeRight:
+      return INPUT_KEY_RIGHT;
+    case kHIDRemoteButtonCodeRightHold:
+      return INPUT_KEY_RIGHT_LONG;
+    case kHIDRemoteButtonCodeMenu:
+      return INPUT_KEY_MENU;
+    case kHIDRemoteButtonCodeMenuHold:
+      return INPUT_KEY_MENU_LONG;
+    case kHIDRemoteButtonCodePlay:
+      return INPUT_KEY_PLAY;
+    case kHIDRemoteButtonCodePlayHold:
+      return INPUT_KEY_PLAY_LONG;
+    case kHIDRemoteButtonCodeUp:
+      return INPUT_KEY_UP;
+    case kHIDRemoteButtonCodeUpHold:
+      return INPUT_KEY_UP_LONG;
+    default:
+      QLOG_WARN() << "could not handle key code:" << code;
+  }
+  return "";
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void InputAppleRemote::remoteButtonEvent(quint8 code, bool pressed, const QString &name)
+{
+  if (pressed)
+  {
+    QString codeStr = codeToString((HIDRemoteButtonCode)code);
+    if (!codeStr.isEmpty())
+    {
+      QLOG_DEBUG() << name << "pressed button:" << codeStr;
+      emit receivedInput("AppleRemote", codeStr);
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 0000000..cc49c2d
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,276 @@
+#include <locale.h>
+
+#include <QGuiApplication>
+#include <QFileInfo>
+#include <QIcon>
+#include <QtQml>
+#include <QtWebEngine/qtwebengineglobal.h>
+#include <shared/Names.h>
+
+#include "system/SystemComponent.h"
+#include "system/UpdateManager.h"
+#include "QsLog.h"
+#include "Paths.h"
+#include "player/PlayerComponent.h"
+#include "breakpad/CrashDumps.h"
+#include "Version.h"
+#include "settings/SettingsComponent.h"
+#include "ui/KonvergoWindow.h"
+#include "ui/KonvergoEngine.h"
+#include "UniqueApplication.h"
+#include "utils/HelperLauncher.h"
+
+#if defined(Q_OS_MAC) || defined(Q_OS_LINUX)
+#include "SignalManager.h"
+#endif
+
+using namespace QsLogging;
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void initQt(QGuiApplication* app)
+{
+  QCoreApplication::setApplicationName(Names::MainName());
+  QCoreApplication::setApplicationVersion(Version::GetVersionString());
+  QCoreApplication::setOrganizationDomain("plex.tv");
+
+  app->setWindowIcon(QIcon(":/images/icon.png"));
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+static void qtMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)
+{
+    QByteArray localMsg = msg.toLocal8Bit();
+    QString prefix;
+    if (context.line)
+      prefix = QString("%1:%2:%3: ").arg(context.file).arg(context.line).arg(context.function);
+    QString text = prefix + msg;
+    switch (type)
+    {
+      case QtDebugMsg:
+        QLOG_DEBUG() << text;
+        break;
+      case QtInfoMsg:
+        QLOG_INFO() << text;
+        break;
+      case QtWarningMsg:
+        QLOG_WARN() << text;
+        break;
+      case QtCriticalMsg:
+        QLOG_ERROR() << text;
+        break;
+      case QtFatalMsg:
+        QLOG_FATAL() << text;
+        break;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+static void elidePattern(QString& msg, const QString& substring, int chars)
+{
+  int start = 0;
+  while (true)
+  {
+    start = msg.indexOf(substring, start);
+    if (start < 0 || start + substring.length() + chars > msg.length())
+      break;
+    start += substring.length();
+    for (int n = 0; n < chars; n++)
+      msg[start + n] = QChar('x');
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+static void processLog(QString& msg)
+{
+  elidePattern(msg, "X-Plex-Token=", 20);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void initLogger()
+{
+  // Note where the logfile is going to be
+  qDebug("Logging to %s", qPrintable(Paths::logDir(Names::MainName() + ".log")));
+
+  // init logging.
+  DestinationPtr dest = DestinationFactory::MakeFileDestination(
+    Paths::logDir(Names::MainName() + ".log"),
+    EnableLogRotationOnOpen,
+    MaxSizeBytes(1024 * 1024),
+    MaxOldLogCount(9));
+
+  Logger::instance().addDestination(dest);
+  Logger::instance().setLoggingLevel(DebugLevel);
+  Logger::instance().setProcessingCallback(processLog);
+
+  qInstallMessageHandler(qtMessageOutput);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+char** appendCommandLineArguments(int *argc, char **argv)
+{
+  static char *newArgs[16];
+  QList<QString> argList;
+
+  // Copy argv list to our StringList
+  for (int i=0; i < *argc; i++)
+  {
+    argList << QString(argv[i]);
+  }
+
+  // add any required additionnal commandline argument
+#if KONVERGO_OPENELEC
+  // on RPI with webengine, OpenGL contexts are shared statically with webengine
+  // which avoids proper reset when switching display mode
+  // On OE we also need that because there is a crash with OZONE otherwise
+  argList << "--disable-gpu";
+#endif
+
+  // with webengine we need those to have a proper scaling of the webview in the window
+  argList << "--enable-viewport";
+  argList << "--enable-viewport-meta";
+
+  // Now rebuild our argc, argv list
+  *argc = argList.size();
+
+  for(int iarg=0; iarg < argList.size(); iarg++)
+  {
+    newArgs[iarg] = (char*)malloc(256);
+    strcpy(newArgs[iarg], argList.value(iarg).toStdString().c_str());
+  }
+
+  return (char**)newArgs;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+int main(int argc, char *argv[])
+{
+  try
+  {
+    int newArgc = argc;
+    char **newArgv = appendCommandLineArguments(&newArgc, argv);
+
+    // Supress SSL related warnings on OSX
+    // See https://bugreports.qt.io/browse/QTBUG-43173 for more info
+    //
+#ifdef Q_OS_MAC
+    qputenv("QT_LOGGING_RULES", "qt.network.ssl.warning=false");
+
+    // Request OpenGL 4.1 if possible on OSX, otherwise it defaults to 2.0
+    // This needs to be done before we create the QGuiApplication
+    //
+    QSurfaceFormat format = QSurfaceFormat::defaultFormat();
+    format.setMajorVersion(3);
+    format.setMinorVersion(2);
+    format.setProfile(QSurfaceFormat::CoreProfile);
+    QSurfaceFormat::setDefaultFormat(format);
+#endif
+
+    QGuiApplication app(newArgc, newArgv);
+    initQt(&app);
+
+    // init breakpad.
+    setupCrashDumper();
+
+    UniqueApplication* uniqueApp = new UniqueApplication();
+    if (!uniqueApp->ensureUnique())
+      return EXIT_SUCCESS;
+
+#ifdef Q_OS_UNIX
+    // install signals handlers for proper app closing.
+    SignalManager signalManager(&app);
+    Q_UNUSED(signalManager);
+#endif
+
+    initLogger();
+    QLOG_INFO() << "Starting Plex Media Player version:" << Version::GetVersionString() << "build date:" << Version::GetBuildDate();
+
+    // Quit app and apply update if we find one.
+    if (UpdateManager::CheckForUpdates())
+    {
+      app.quit();
+      return 0;
+    }
+
+#ifdef Q_OS_WIN32
+    initD3DDevice();
+#endif
+
+#ifdef Q_OS_UNIX
+    setlocale(LC_NUMERIC, "C");
+#endif
+
+    // Initialize all the components. This needs to be done
+    // early since most everything else relies on it
+    //
+    ComponentManager::Get().initialize();
+
+    // enable remote inspection if we have the correct setting for it.
+    if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "remoteInspector").toBool())
+      qputenv("QTWEBENGINE_REMOTE_DEBUGGING", "0.0.0.0:9992");
+
+    QtWebEngine::initialize();
+
+    // Qt and QWebEngineProfile set the locale, which breaks parsing and
+    // formatting float numbers in a few countries.
+#ifdef Q_OS_UNIX
+    setlocale(LC_NUMERIC, "C");
+#endif
+
+    // start our helper
+    HelperLauncher::Get().connectToHelper();
+
+    // load QtWebChannel so that we can register our components with it.
+    QQmlApplicationEngine *engine = KonvergoEngine::Get();
+    KonvergoWindow::RegisterClass();
+    engine->rootContext()->setContextProperty("components", &ComponentManager::Get().getQmlPropertyMap());
+
+    // the only way to detect if QML parsing fails is to hook to this signal and then see
+    // if we get a valid object passed to it. Any error messages will be reported on stderr
+    // but since no normal user should ever see this it should be fine
+    //
+    QObject::connect(engine, &QQmlApplicationEngine::objectCreated, [=](QObject* object, const QUrl& url)
+    {
+      Q_UNUSED(url);
+
+      if (object == 0)
+        throw FatalException(QObject::tr("Failed to parse application engine script."));
+
+      QObject* rootObject = engine->rootObjects().first();
+
+      QObject* webChannel = qvariant_cast<QObject*>(rootObject->property("webChannel"));
+      Q_ASSERT(webChannel);
+      ComponentManager::Get().setWebChannel(qobject_cast<QWebChannel*>(webChannel));
+
+      KonvergoWindow* window = qobject_cast<KonvergoWindow*>(rootObject);
+      Q_ASSERT(window);
+      QObject::connect(uniqueApp, &UniqueApplication::otherApplicationStarted, window, &KonvergoWindow::otherAppFocus);
+
+    });
+    engine->load(QUrl(QStringLiteral("qrc:/ui/webview.qml")));
+
+    // run our application
+    int ret = app.exec();
+
+    delete KonvergoEngine::Get();
+    delete uniqueApp;
+
+    return ret;
+  }
+  catch (FatalException& e)
+  {
+
+    QLOG_FATAL() << "Unhandled FatalException:" << qPrintable(e.message());
+
+    QGuiApplication app(argc, argv);
+    QString text = e.message() + "<br>" + QObject::tr("Please visit Plex support forums for support.");
+
+    QQmlApplicationEngine* engine = new QQmlApplicationEngine(NULL);
+    engine->rootContext()->setContextProperty("errorTitle", QObject::tr("A critical error happened!"));
+    engine->rootContext()->setContextProperty("errorText", text);
+    engine->load(QUrl(QStringLiteral("qrc:/ui/errormessage.qml")));
+
+    app.exec();
+    return 1;
+
+  }
+}
diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
new file mode 100644
index 0000000..5c549d7
--- /dev/null
+++ b/src/player/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_sources(PlayerComponent.cpp PlayerComponent.h)
+add_sources(PlayerQuickItem.cpp PlayerQuickItem.h)
diff --git a/src/player/PlayerComponent.cpp b/src/player/PlayerComponent.cpp
new file mode 100644
index 0000000..9096122
--- /dev/null
+++ b/src/player/PlayerComponent.cpp
@@ -0,0 +1,842 @@
+#include "PlayerComponent.h"
+#include <QString>
+#include <Qt>
+#include <QDir>
+#include <QCoreApplication>
+#include "display/DisplayComponent.h"
+#include "settings/SettingsComponent.h"
+#include "system/SystemComponent.h"
+#include "utils/Utils.h"
+#include "ComponentManager.h"
+#include "settings/SettingsSection.h"
+
+#include "PlayerQuickItem.h"
+
+#include "QsLog.h"
+
+#include <math.h>
+#include <string.h>
+#include <shared/Paths.h>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static void wakeup_cb(void *context)
+{
+  PlayerComponent *player = (PlayerComponent *)context;
+
+  emit player->onMpvEvents();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+PlayerComponent::PlayerComponent(QObject* parent)
+  : ComponentBase(parent), m_lastPositionUpdate(0.0), m_playbackAudioDelay(0), m_playbackStartSent(false), m_window(0), m_mediaFrameRate(0),
+  m_restoreDisplayTimer(this), m_reloadAudioTimer(this)
+{
+  qmlRegisterType<PlayerQuickItem>("Konvergo", 1, 0, "MpvVideo"); // deprecated name
+  qmlRegisterType<PlayerQuickItem>("Konvergo", 1, 0, "KonvergoVideo");
+
+  m_restoreDisplayTimer.setSingleShot(true);
+  connect(&m_restoreDisplayTimer, &QTimer::timeout, this, &PlayerComponent::onRestoreDisplay);
+
+  connect(&DisplayComponent::Get(), &DisplayComponent::refreshRateChanged, this, &PlayerComponent::onRefreshRateChange);
+
+  m_reloadAudioTimer.setSingleShot(true);
+  connect(&m_reloadAudioTimer, &QTimer::timeout, this, &PlayerComponent::onReloadAudio);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+PlayerComponent::~PlayerComponent()
+{
+  if (m_mpv)
+    mpv_set_wakeup_callback(m_mpv, NULL, NULL);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool PlayerComponent::componentInitialize()
+{
+  m_mpv = mpv::qt::Handle::FromRawHandle(mpv_create());
+  if (!m_mpv)
+    throw FatalException(tr("Failed to load mpv."));
+
+  mpv_request_log_messages(m_mpv, "terminal-default");
+  mpv_set_option_string(m_mpv, "msg-level", "all=v");
+
+  // No mouse events
+  mpv_set_option_string(m_mpv, "input-cursor", "no");
+  mpv_set_option_string(m_mpv, "cursor-autohide", "no");
+
+  mpv_set_option_string(m_mpv, "config", "yes");
+  mpv_set_option_string(m_mpv, "config-dir", Paths::dataDir().toUtf8().data());
+
+  // We don't need this, so avoid initializing fontconfig.
+  mpv_set_option_string(m_mpv, "use-text-osd", "no");
+
+  // Always use the system mixer.
+  mpv_set_option_string(m_mpv, "softvol", "no");
+
+  // Just discard audio output if no audio device could be opened. This gives
+  // us better flexibility how to react to such errors (instead of just
+  // aborting playback immediately).
+  mpv_set_option_string(m_mpv, "audio-fallback-to-null", "yes");
+
+  // Make it load the hwdec interop, so hwdec can be enabled at runtime.
+  mpv::qt::set_option_variant(m_mpv, "hwdec-preload", "auto");
+
+  // User-visible application name used by some audio APIs (at least PulseAudio).
+  mpv_set_option_string(m_mpv, "audio-client-name", QCoreApplication::applicationName().toUtf8().data());
+  // User-visible stream title used by some audio APIs (at least PulseAudio and wasapi).
+  mpv_set_option_string(m_mpv, "title", QCoreApplication::applicationName().toUtf8().data());
+
+  // Apply some low-memory settings on RPI, which is relatively memory-constrained.
+#ifdef TARGET_RPI
+  // The backbuffer makes seeking back faster (without having to do a HTTP-level seek)
+  mpv::qt::set_option_variant(m_mpv, "cache-backbuffer", 10 * 1024); // KB
+  // The demuxer queue is used for the readahead, and also for dealing with badly
+  // interlaved audio/video. Setting it too low increases sensitivity to network
+  // issues, and could cause playback failure with "bad" files.
+  mpv::qt::set_option_variant(m_mpv, "demuxer-max-bytes", 50 * 1024 * 1024); // bytes
+#endif
+
+  mpv_observe_property(m_mpv, 0, "pause", MPV_FORMAT_FLAG);
+  mpv_observe_property(m_mpv, 0, "cache-buffering-state", MPV_FORMAT_INT64);
+  mpv_observe_property(m_mpv, 0, "playback-time", MPV_FORMAT_DOUBLE);
+  mpv_observe_property(m_mpv, 0, "vo-configured", MPV_FORMAT_FLAG);
+  mpv_observe_property(m_mpv, 0, "duration", MPV_FORMAT_DOUBLE);
+  mpv_observe_property(m_mpv, 0, "audio-device-list", MPV_FORMAT_NODE);
+
+  connect(this, &PlayerComponent::onMpvEvents, this, &PlayerComponent::handleMpvEvents, Qt::QueuedConnection);
+
+  mpv_set_wakeup_callback(m_mpv, wakeup_cb, this);
+
+  if (mpv_initialize(m_mpv) < 0)
+    throw FatalException(tr("Failed to initialize mpv."));
+
+  // Setup a hook with the ID 1, which is run during the file is loaded.
+  // Used to delay playback start for display framerate switching.
+  // (See handler in handleMpvEvent() for details.)
+  mpv::qt::command_variant(m_mpv, QStringList() << "hook-add" << "on_load" << "1" << "0");
+
+  updateAudioDeviceList();
+  setAudioConfiguration();
+  updateSubtitleSettings();
+  updateVideoSettings();
+
+  connect(SettingsComponent::Get().getSection(SETTINGS_SECTION_VIDEO), &SettingsSection::valuesUpdated,
+          this, &PlayerComponent::updateVideoSettings);
+
+  connect(SettingsComponent::Get().getSection(SETTINGS_SECTION_SUBTITLES), &SettingsSection::valuesUpdated,
+          this, &PlayerComponent::updateSubtitleSettings);
+
+  connect(SettingsComponent::Get().getSection(SETTINGS_SECTION_AUDIO), &SettingsSection::valuesUpdated,
+          this, &PlayerComponent::setAudioConfiguration);
+
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setQtQuickWindow(QQuickWindow* window)
+{
+  PlayerQuickItem* video = window->findChild<PlayerQuickItem*>("video");
+  if (!video)
+    throw FatalException(tr("Failed to load video element."));
+
+  mpv_set_option_string(m_mpv, "vo", "opengl-cb");
+
+  video->initMpv(this);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setRpiWindow(QQuickWindow* window)
+{
+  window->setFlags(Qt::FramelessWindowHint);
+
+  mpv_set_option_string(m_mpv, "vo", "rpi");
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setWindow(QQuickWindow* window)
+{
+  bool use_rpi = false;
+#ifdef TARGET_RPI
+  use_rpi = true;
+#endif
+
+  m_window = window;
+  if (!window)
+    return;
+
+  QString force_vo = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "debug.force_vo").toString();
+  if (force_vo.size())
+    mpv::qt::set_option_variant(m_mpv, "vo", force_vo);
+  else if (use_rpi)
+    setRpiWindow(window);
+  else
+    setQtQuickWindow(window);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool PlayerComponent::load(const QString& url, const QVariantMap& options, const QVariantMap &metadata, const QString& audioStream , const QString& subtitleStream)
+{
+  stop();
+  queueMedia(url, options, metadata, audioStream, subtitleStream);
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::queueMedia(const QString& url, const QVariantMap& options, const QVariantMap &metadata, const QString& audioStream, const QString& subtitleStream)
+{
+  m_mediaFrameRate = metadata["frameRate"].toFloat(); // returns 0 on failure
+
+  updateVideoSettings();
+
+  QVariantList command;
+  command << "loadfile" << url;
+  command << "append-play"; // if nothing is playing, play it now, otherwise just enqueue it
+
+  QVariantMap extraArgs;
+
+  quint64 startMilliseconds = options["startMilliseconds"].toLongLong();
+  if (startMilliseconds != 0)
+    extraArgs.insert("start", "+" + QString::number(startMilliseconds / 1000.0));
+
+  // detect subtitles
+  if (!subtitleStream.isEmpty())
+  {
+    // If the stream title starts with a #, then it's an index
+    if (subtitleStream.startsWith("#"))
+      extraArgs.insert("ff-sid", subtitleStream.mid(1));
+    else
+      extraArgs.insert("sub-file", subtitleStream);
+
+    // try guessing the codepage. We could pass a country code to enca to help
+    // it detect the correct one, but we don't get that from the server right now
+    //
+    extraArgs.insert("sub-codepage", "enca");
+  }
+  else
+  {
+    // no subtitles, tell mpv to ignore them.
+    extraArgs.insert("sid", "no");
+  }
+
+  if (metadata["type"] == "music")
+    extraArgs.insert("vid", "no");
+
+  // and then the audio stream
+  if (!audioStream.isEmpty())
+    extraArgs.insert("ff-aid", audioStream);
+
+  extraArgs.insert("pause", options["autoplay"].toBool() ? "no" : "yes");
+
+  command << extraArgs;
+
+  QLOG_DEBUG() << command;
+  mpv::qt::command_variant(m_mpv, command);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool PlayerComponent::switchDisplayFrameRate()
+{
+  QLOG_DEBUG() << "Video framerate:" << m_mediaFrameRate << "fps";
+
+  if (!SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "refreshrate.auto_switch").toBool())
+  {
+    QLOG_DEBUG() << "Not switching refresh-rate (disabled by settings).";
+    return false;
+  }
+
+  bool fs = SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "fullscreen").toBool();
+#if KONVERGO_OPENELEC
+  fs = true;
+#endif
+  if (!fs)
+  {
+    QLOG_DEBUG() << "Not switching refresh-rate (not in fullscreen mode).";
+    return false;
+  }
+
+  if (m_mediaFrameRate < 1)
+  {
+    QLOG_DEBUG() << "Not switching refresh-rate (no known video framerate).";
+    return false;
+  }
+
+  // Make sure a timer started by the previous file ending isn't accidentally
+  // still in-flight. It could switch the display back after we've switched.
+  m_restoreDisplayTimer.stop();
+
+  DisplayComponent* display = &DisplayComponent::Get();
+  if (!display->switchToBestVideoMode(m_mediaFrameRate))
+  {
+    QLOG_DEBUG() << "Switching refresh-rate failed or unnecessary.";
+    return false;
+  }
+
+  // Make sure settings dependent on the display refresh rate are updated properly.
+  updateVideoSettings();
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::onRestoreDisplay()
+{
+  // If the player will in fact start another file (or is playing one), don't restore.
+  if (mpv::qt::get_property_variant(m_mpv, "idle").toBool())
+    DisplayComponent::Get().restorePreviousVideoMode();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::onRefreshRateChange()
+{
+  // Make sure settings dependent on the display refresh rate are updated properly.
+  updateVideoSettings();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::handleMpvEvent(mpv_event *event)
+{
+  switch (event->event_id)
+  {
+    case MPV_EVENT_START_FILE:
+    {
+      m_CurrentUrl = mpv::qt::get_property_variant(m_mpv, "path").toString();
+      m_playbackStartSent = false;
+      break;
+    }
+    case MPV_EVENT_FILE_LOADED:
+    {
+      emit playing(m_CurrentUrl);
+      break;
+    }
+    case MPV_EVENT_END_FILE:
+    {
+      mpv_event_end_file *end_file = (mpv_event_end_file *)event->data;
+      switch (end_file->reason)
+      {
+        case MPV_END_FILE_REASON_EOF:
+          emit finished(m_CurrentUrl);
+          break;
+        case MPV_END_FILE_REASON_ERROR:
+          emit error(end_file->error, mpv_error_string(end_file->error));
+          break;
+        default:
+          emit stopped(m_CurrentUrl);
+          break;
+      }
+
+      emit playbackEnded(m_CurrentUrl);
+      m_CurrentUrl = "";
+
+      m_restoreDisplayTimer.start(0);
+      break;
+    }
+    case MPV_EVENT_IDLE:
+    {
+      emit playbackAllDone();
+      break;
+    }
+    case MPV_EVENT_PLAYBACK_RESTART:
+    {
+      // it's also sent after seeks are completed
+      if (!m_playbackStartSent)
+        emit playbackStarting();
+      m_playbackStartSent = true;
+      break;
+    }
+    case MPV_EVENT_PROPERTY_CHANGE:
+    {
+      mpv_event_property *prop = (mpv_event_property *)event->data;
+      if (strcmp(prop->name, "pause") == 0 && prop->format == MPV_FORMAT_FLAG)
+      {
+        int state = *(int *)prop->data;
+        emit paused(state);
+      }
+      else if (strcmp(prop->name, "cache-buffering-state") == 0 && prop->format == MPV_FORMAT_INT64)
+      {
+        int64_t percentage = *(int64_t *)prop->data;
+        emit buffering(percentage);
+      }
+      else if (strcmp(prop->name, "playback-time") == 0 && prop->format == MPV_FORMAT_DOUBLE)
+      {
+        double pos = *(double*)prop->data;
+        if (fabs(pos - m_lastPositionUpdate) > 0.25)
+        {
+          quint64 ms = (quint64)(qMax(pos * 1000.0, 0.0));
+          emit positionUpdate(ms);
+          m_lastPositionUpdate = pos;
+        }
+      }
+      else if (strcmp(prop->name, "vo-configured") == 0)
+      {
+        int state = prop->format == MPV_FORMAT_FLAG ? *(int *)prop->data : 0;
+        emit windowVisible(state);
+      }
+      else if (strcmp(prop->name, "duration") == 0)
+      {
+        if (prop->format == MPV_FORMAT_DOUBLE)
+          emit updateDuration(*(double *)prop->data * 1000.0);
+      }
+      else if (strcmp(prop->name, "audio-device-list") == 0)
+      {
+        updateAudioDeviceList();
+      }
+      break;
+    }
+    case MPV_EVENT_LOG_MESSAGE:
+    {
+      mpv_event_log_message *msg = (mpv_event_log_message *)event->data;
+      // Strip the trailing '\n'
+      size_t len = strlen(msg->text);
+      if (len > 0 && msg->text[len - 1] == '\n')
+        len -= 1;
+      QString logline = QString::fromUtf8(msg->prefix) + ": " + QString::fromUtf8(msg->text, len);
+      if (msg->log_level >= MPV_LOG_LEVEL_V)
+        QLOG_DEBUG() << qPrintable(logline);
+      else if (msg->log_level >= MPV_LOG_LEVEL_INFO)
+        QLOG_INFO() << qPrintable(logline);
+      else if (msg->log_level >= MPV_LOG_LEVEL_WARN)
+        QLOG_WARN() << qPrintable(logline);
+      else
+        QLOG_ERROR() << qPrintable(logline);
+      break;
+    }
+    case MPV_EVENT_CLIENT_MESSAGE:
+    {
+      mpv_event_client_message *msg = (mpv_event_client_message *)event->data;
+      // This happens when the player is about to load the file, but no actual loading has taken part yet.
+      // We use this to block loading until we explicitly tell it to continue.
+      if (msg->num_args >= 3 && !strcmp(msg->args[0], "hook_run") && !strcmp(msg->args[1], "1"))
+      {
+        QString resume_id = QString::fromUtf8(msg->args[2]);
+        // Calling this lambda will instruct mpv to continue loading the file.
+        auto resume = [=] {
+          mpv::qt::command_variant(m_mpv, QStringList() << "hook-ack" << resume_id);
+        };
+        if (switchDisplayFrameRate())
+        {
+          // Now wait for some time for mode change - this is needed because mode changing can take some
+          // time, during which the screen is black, and initializing hardware decoding could fail due
+          // to various strange OS-related reasons.
+          // (Better hope the user doesn't try to exit Konvergo during mode change.)
+          int pause = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "refreshrate.delay").toInt() * 1000;
+          QTimer::singleShot(pause, resume);
+        }
+        else
+        {
+          resume();
+        }
+        break;
+      }
+    }
+    default:; /* ignore */
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::handleMpvEvents()
+{
+  // Process all events, until the event queue is empty.
+  while (1)
+  {
+    mpv_event *event = mpv_wait_event(m_mpv, 0);
+    if (event->event_id == MPV_EVENT_NONE)
+      break;
+    handleMpvEvent(event);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setVideoOnlyMode(bool enable)
+{
+  if (m_window)
+  {
+    QQuickItem *web = m_window->findChild<QQuickItem *>("web");
+    if (web)
+      web->setVisible(!enable);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::play()
+{
+  QStringList args = (QStringList() << "set" << "pause" << "no");
+  mpv::qt::command_variant(m_mpv, args);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::stop()
+{
+  QStringList args("stop");
+  mpv::qt::command_variant(m_mpv, args);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::clearQueue()
+{
+  QStringList args("playlist_clear");
+  mpv::qt::command_variant(m_mpv, args);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::pause()
+{
+  QStringList args = (QStringList() << "set" << "pause" << "yes");
+  mpv::qt::command_variant(m_mpv, args);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::seekTo(qint64 ms)
+{
+  double start = mpv::qt::get_property_variant(m_mpv, "time-start").toDouble();
+  QString timeStr = QString::number(ms / 1000.0 + start);
+  QStringList args = (QStringList() << "seek" << timeStr << "absolute");
+  mpv::qt::command_variant(m_mpv, args);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QVariant PlayerComponent::getAudioDeviceList()
+{
+  return mpv::qt::get_property_variant(m_mpv, "audio-device-list");
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setAudioDevice(const QString& name)
+{
+  mpv::qt::set_property_variant(m_mpv, "audio-device", name);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setVolume(quint8 volume)
+{
+  // Will fail if no audio output opened (i.e. no file playing)
+  mpv::qt::set_property_variant(m_mpv, "volume", volume);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+quint8 PlayerComponent::volume()
+{
+  QVariant volume = mpv::qt::get_property_variant(m_mpv, "volume");
+  if (volume.isValid())
+    return volume.toInt();
+  return 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setSubtitleStream(const QString &subtitleStream)
+{
+  if (subtitleStream.isEmpty())
+  {
+    mpv::qt::set_property_variant(m_mpv, "ff-sid", "no");
+  }
+  else if (subtitleStream.startsWith("#"))
+  {
+    mpv::qt::set_property_variant(m_mpv, "ff-sid", subtitleStream.mid(1));
+  }
+  else
+  {
+    QStringList args = (QStringList() << "sub_add" << subtitleStream << "cached");
+    mpv::qt::command_variant(m_mpv, args);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setAudioStream(const QString &audioStream)
+{
+  if (audioStream.isEmpty())
+    mpv::qt::set_property_variant(m_mpv, "ff-aid", "no");
+  else
+    mpv::qt::set_property_variant(m_mpv, "ff-aid", audioStream);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setAudioDelay(qint64 milliseconds)
+{
+  m_playbackAudioDelay = milliseconds;
+
+  double display_fps = DisplayComponent::Get().currentRefreshRate();
+  const char *audio_delay_setting = "audio_delay.normal";
+  if (fabs(display_fps - 24) < 1) // cover 24Hz, 23.976Hz, and values very close
+    audio_delay_setting = "audio_delay.24hz";
+
+  double fixed_delay = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, audio_delay_setting).toFloat();
+  mpv::qt::set_option_variant(m_mpv, "audio-delay", (fixed_delay + m_playbackAudioDelay) / 1000.0);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setSubtitleDelay(qint64 milliseconds)
+{
+  mpv::qt::set_option_variant(m_mpv, "sub-delay", milliseconds / 1000.0);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::onReloadAudio()
+{
+  mpv::qt::command_variant(m_mpv, QStringList() << "ao_reload");
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// This is called with the set of previous audio devices that were detected, and the set of current
+// audio devices. From this we guess whether we should reopen the audio device. If the user-selected
+// device went away previously, and now comes back, reinitializing the player's audio output will
+// force the player and/or the OS to move audio output back to the user-selected device.
+void PlayerComponent::checkCurrentAudioDevice(const QSet<QString>& old_devs, const QSet<QString>& new_devs)
+{
+  QString user_device = SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "device").toString();
+
+  QSet<QString> removed = old_devs - new_devs;
+  QSet<QString> added = new_devs - old_devs;
+
+  QLOG_DEBUG() << "Audio devices removed:" << removed;
+  QLOG_DEBUG() << "Audio devices added:" << added;
+  QLOG_DEBUG() << "Audio device selected:" << user_device;
+
+  if (!mpv::qt::get_property_variant(m_mpv, "idle").toBool() && user_device.length())
+  {
+    if (added.contains(user_device))
+    {
+      // The timer is for debouncing the reload. Several change notifications could
+      // come in quick succession. Also, it's possible that trying to open the
+      // reappeared audio device immediately can fail.
+      m_reloadAudioTimer.start(500);
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::updateAudioDeviceList()
+{
+  QVariantList settingList;
+  QVariant list = getAudioDeviceList();
+  QSet<QString> devices;
+  foreach (const QVariant& d, list.toList())
+  {
+    Q_ASSERT(d.type() == QVariant::Map);
+    QVariantMap dmap = d.toMap();
+
+    devices.insert(dmap["name"].toString());
+
+    QVariantMap entry;
+    entry["value"] = dmap["name"];
+    entry["title"] = dmap["description"];
+
+    settingList << entry;
+  }
+
+  SettingsComponent::Get().updatePossibleValues(SETTINGS_SECTION_AUDIO, "device", settingList);
+
+  checkCurrentAudioDevice(m_audioDevices, devices);
+  m_audioDevices = devices;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::setAudioConfiguration()
+{
+  QStringList ao_defaults;
+  // On OSX, ask mpv to change the audio format system-wide. This is needed
+  // at least to get multichannel PCM running, if the user didn't already
+  // select multichannel output in "Audio MIDI Setup".
+  ao_defaults << "coreaudio:change-physical-format=yes";
+
+  QString deviceType = SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "devicetype").toString();
+
+  if (SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "exclusive").toBool())
+  {
+    ao_defaults << "wasapi:exclusive=yes";
+    ao_defaults << "coreaudio:exclusive=yes";
+  }
+
+  mpv::qt::set_option_variant(m_mpv, "ao-defaults", ao_defaults.join(','));
+
+  // set the audio device
+  QVariant device = SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "device");
+  mpv::qt::set_property_variant(m_mpv, "audio-device", device);
+
+  // set the channel layout
+  QVariant layout = SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "channels");
+  mpv::qt::set_option_variant(m_mpv, "audio-channels", layout);
+
+  QString resampleOpts = "";
+  bool normalize = SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "normalize").toBool();
+  resampleOpts += QString(":normalize=") + (normalize ? "yes" : "no");
+
+#ifdef TARGET_RPI
+  // Low-quality resampling options on RPI for better display-sync behavior.
+  resampleOpts += ":o=[filter_type=cubic,filter_size=8,phase_shift=6]";
+#endif
+
+  mpv::qt::set_option_variant(m_mpv, "af-defaults", "lavrresample" + resampleOpts);
+
+  QString passthroughCodecs;
+  // passthrough doesn't make sense with basic type
+  if (deviceType != AUDIO_DEVICE_TYPE_BASIC)
+  {
+    QStringList enabledCodecs;
+    SettingsSection* audioSection = SettingsComponent::Get().getSection(SETTINGS_SECTION_AUDIO);
+
+    QStringList codecs;
+    if (deviceType == AUDIO_DEVICE_TYPE_SPDIF)
+      codecs = AudioCodecsSPDIF();
+    else if (deviceType == AUDIO_DEVICE_TYPE_HDMI && audioSection->value("advanced").toBool())
+      codecs = AudioCodecsAll();
+
+    foreach (const QString& key, codecs)
+    {
+      if (audioSection->value("passthrough." + key).toBool())
+        enabledCodecs << key;
+    }
+
+    // dts-hd includes dts, but listing dts before dts-hd may disable dts-hd.
+    if (enabledCodecs.indexOf("dts-hd") != -1)
+      enabledCodecs.removeAll("dts");
+
+    passthroughCodecs = enabledCodecs.join(",");
+  }
+
+  mpv::qt::set_option_variant(m_mpv, "audio-spdif", passthroughCodecs);
+
+  // if the user has indicated that we have a optical spdif connection
+  // we need to set this extra option that allows us to transcode
+  // 5.1 audio into a usable format, note that we only support AC3
+  // here for now. We might need to add support for DTS transcoding
+  // if we see user requests for it.
+  //
+  bool doAc3Transcoding = false;
+  if (deviceType == AUDIO_DEVICE_TYPE_SPDIF &&
+      SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "passthrough.ac3").toBool())
+  {
+    QLOG_INFO() << "Enabling audio AC3 transcoding (if needed)";
+    mpv::qt::set_option_variant(m_mpv, "af", "lavcac3enc");
+    doAc3Transcoding = true;
+  }
+
+  // Make a informational log message.
+  QString audioConfig = QString(QString("Audio Config - device: %1, ") +
+                                        "channel layout: %2, " +
+                                        "passthrough codecs: %3, " +
+                                        "ac3 transcoding: %4").arg(device.toString(),
+                                                                   layout.toString(),
+                                                                   passthroughCodecs.isEmpty() ? "none" : passthroughCodecs,
+                                                                   doAc3Transcoding ? "yes" : "no");
+  QLOG_INFO() << qPrintable(audioConfig);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::updateSubtitleSettings()
+{
+  QVariant size = SettingsComponent::Get().value(SETTINGS_SECTION_SUBTITLES, "size");
+  mpv::qt::set_option_variant(m_mpv, "sub-text-font-size", size);
+
+  QVariant colors_string = SettingsComponent::Get().value(SETTINGS_SECTION_SUBTITLES, "color");
+  auto colors = colors_string.toString().split(",");
+  if (colors.length() == 2)
+  {
+    mpv::qt::set_option_variant(m_mpv, "sub-text-color", colors[0]);
+    mpv::qt::set_option_variant(m_mpv, "sub-text-border-color", colors[1]);
+  }
+
+  QVariant subpos_string = SettingsComponent::Get().value(SETTINGS_SECTION_SUBTITLES, "placement");
+  auto subpos = subpos_string.toString().split(",");
+  if (subpos.length() == 2)
+  {
+    mpv::qt::set_option_variant(m_mpv, "sub-text-align-x", subpos[0]);
+    mpv::qt::set_option_variant(m_mpv, "sub-text-align-y", subpos[1]);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::updateVideoSettings()
+{
+  QVariant sync_mode = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "sync_mode");
+  mpv::qt::set_option_variant(m_mpv, "video-sync", sync_mode);
+  QVariant hardware_decoding = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "hardware_decoding");
+  mpv::qt::set_property_variant(m_mpv, "hwdec", hardware_decoding.toBool() ? "auto" : "no");
+  QVariant deinterlace = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "deinterlace");
+  mpv::qt::set_option_variant(m_mpv, "deinterlace", deinterlace.toBool() ? "yes" : "no");
+
+#ifndef TARGET_RPI
+  double display_fps = DisplayComponent::Get().currentRefreshRate();
+  mpv::qt::set_option_variant(m_mpv, "display-fps", display_fps);
+#endif
+
+  setAudioDelay(m_playbackAudioDelay);
+
+  QVariant cache = SettingsComponent::Get().value(SETTINGS_SECTION_VIDEO, "cache");
+  mpv::qt::set_option_variant(m_mpv, "cache", cache.toInt() * 1024);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void PlayerComponent::userCommand(const QString& command)
+{
+  QByteArray cmd_utf8 = command.toUtf8();
+  mpv_command_string(m_mpv, cmd_utf8.data());
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+static QString get_mpv_osd(mpv_handle *ctx, const char *property)
+{
+  char *s = mpv_get_property_osd_string(ctx, property);
+  if (!s)
+    return "-";
+  QString r = QString::fromUtf8(s);
+  mpv_free(s);
+  return r;
+}
+
+#define MPV_PROPERTY(p) get_mpv_osd(m_mpv, p)
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString PlayerComponent::videoInformation() const
+{
+  QString infoStr;
+  QTextStream info(&infoStr);
+
+  // check if video is playing
+  if (mpv::qt::get_property_variant(m_mpv, "idle").toBool())
+    return "";
+
+  info << "File:" << endl;
+  info << "URL: " << MPV_PROPERTY("path") << endl;
+  info << "Container: " << MPV_PROPERTY("file-format") << endl;
+  info << endl;
+  info << "Video:" << endl;
+  info << "Codec: " << MPV_PROPERTY("video-codec") << endl;
+  info << "Size: " << MPV_PROPERTY("video-params/dw") << "x"
+                   << MPV_PROPERTY("video-params/dh") << endl;
+  info << "FPS: " << MPV_PROPERTY("fps") << endl;
+  info << "Aspect: " << MPV_PROPERTY("video-aspect") << endl;
+  info << "Bitrate: " << MPV_PROPERTY("video-bitrate") << endl;
+  info << "Display Sync: " << MPV_PROPERTY("display-sync-active") << endl;
+  info << "Hardware Decoding: " << MPV_PROPERTY("hwdec-active")
+                                << " (" << MPV_PROPERTY("hwdec-detected") << ")" << endl;
+  info << endl;
+  info << "Audio: " << endl;
+  info << "Codec: " << MPV_PROPERTY("audio-codec") << endl;
+  info << "Bitrate: " << MPV_PROPERTY("audio-bitrate") << endl;
+  info << "Channels (input): " << MPV_PROPERTY("audio-params/channels") << endl;
+  info << "Channels (output): " << MPV_PROPERTY("audio-out-params/hr-channels")
+                                << " (" << MPV_PROPERTY("audio-out-params/channels") << ")" << endl;
+  info << endl;
+  info << "Performance: " << endl;
+  info << "A/V: " << MPV_PROPERTY("avsync") << endl;
+  info << "Change: " << MPV_PROPERTY("total-avsync-change") << endl;
+  info << "Dropped frames: " << MPV_PROPERTY("vo-drop-frame-count") << endl;
+  info << "Missed frames: " << MPV_PROPERTY("vo-missed-frame-count") << endl;
+  info << endl;
+  info << "Cache:" << endl;
+  info << "Seconds: " << MPV_PROPERTY("demuxer-cache-duration") << endl;
+  info << "Extra readahead: " << MPV_PROPERTY("cache-used") << endl;
+  info << "Buffering: " << MPV_PROPERTY("cache-buffering-state") << endl;
+  info << endl;
+  info << "Misc: " << endl;
+  info << "Time: " << MPV_PROPERTY("playback-time") << " / "
+                   << MPV_PROPERTY("duration")
+                   << " (" << MPV_PROPERTY("percent-pos") << "%)" << endl;
+  info << "Pause state: " << MPV_PROPERTY("pause") << " / "
+                          << MPV_PROPERTY("paused-for-cache") << " / "
+                          << MPV_PROPERTY("core-idle") << endl;
+  info << "Seeking: " << MPV_PROPERTY("seeking") << endl;
+  info << "Seekable: " << MPV_PROPERTY("seekable") << " / "
+                       << MPV_PROPERTY("partially-seekable") << endl;
+
+  info << flush;
+  return infoStr;
+}
diff --git a/src/player/PlayerComponent.h b/src/player/PlayerComponent.h
new file mode 100644
index 0000000..5a30da7
--- /dev/null
+++ b/src/player/PlayerComponent.h
@@ -0,0 +1,166 @@
+#ifndef PLAYERCOMPONENT_H
+#define PLAYERCOMPONENT_H
+
+#include <QObject>
+#include <QtCore/qglobal.h>
+#include <QVariant>
+#include <QSet>
+#include <QQuickWindow>
+#include <QTimer>
+
+#include "ComponentManager.h"
+
+#include <mpv/client.h>
+#include <mpv/qthelper.hpp>
+
+void initD3DDevice(void);
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class PlayerComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(PlayerComponent);
+
+public:
+  virtual const char* componentName() { return "player"; }
+  virtual bool componentExport() { return true; }
+  virtual bool componentInitialize();
+  
+  explicit PlayerComponent(QObject* parent = 0);
+  virtual ~PlayerComponent();
+
+  // Deprecated. Corresponds to stop() + queueMedia().
+  Q_INVOKABLE bool load(const QString& url, const QVariantMap& options, const QVariantMap& metadata, const QString& audioStream = QString(), const QString& subtitleStream = QString());
+
+  // Append a media item to the internal playlist. If nothing is played yet, the
+  // newly appended item will start playing immediately.
+  // options:
+  //  - startMilliseconds: start playback at this time (in ms)
+  //  - autoplay: if false, start playback paused; if true, start normally
+  Q_INVOKABLE void queueMedia(const QString& url, const QVariantMap& options, const QVariantMap &metadata, const QString& audioStream, const QString& subtitleStream);
+
+  // This clears all items queued with queueMedia().
+  // It explicitly excludes the currently playing item. The main use of this function
+  // is updating the next item that should be played (for the purpose of gapless audio).
+  // If you want to wipe everything, use stop().
+  Q_INVOKABLE void clearQueue();
+
+  Q_INVOKABLE virtual void seekTo(qint64 milliseconds);
+
+  // Stop playback and clear all queued items.
+  Q_INVOKABLE virtual void stop();
+
+  Q_INVOKABLE virtual void pause();
+  Q_INVOKABLE virtual void play();
+  
+  /* 0-100 volume 0=mute and 100=normal */
+  Q_INVOKABLE virtual void setVolume(quint8 volume);
+  Q_INVOKABLE virtual quint8 volume();
+
+  // Returns a QVariant of the following format:
+  // QVariantList                   (list of audio device entries)
+  //    QVariantMap                 (an audio device entry)
+  //      "name" -> QString         (symbolic name/ID of the device)
+  //      "description" -> QString  (human readable description intended for display)
+  //
+  Q_INVOKABLE virtual QVariant getAudioDeviceList();
+  // Uses the "name" from the device list.
+  Q_INVOKABLE virtual void setAudioDevice(const QString& name);
+  
+  Q_INVOKABLE virtual void setAudioStream(const QString& audioStream);
+  Q_INVOKABLE virtual void setSubtitleStream(const QString& subtitleStream);
+
+  Q_INVOKABLE virtual void setAudioDelay(qint64 milliseconds);
+  Q_INVOKABLE virtual void setSubtitleDelay(qint64 milliseconds);
+
+  // If enabled, hide the web view (whether it's OSD or not), and show video
+  // only. If no video is running, render a black background only.
+  Q_INVOKABLE virtual void setVideoOnlyMode(bool enable);
+
+  void userCommand(const QString& command);
+
+  const mpv::qt::Handle getMpvHandle() const { return m_mpv; }
+
+  virtual void setWindow(QQuickWindow* window);
+
+  QString videoInformation() const;
+
+  static QStringList AudioCodecsAll() { return { "ac3", "dts", "eac3", "dts-hd", "truehd" }; };
+  static QStringList AudioCodecsSPDIF() { return { "ac3", "dts" }; };
+  
+public Q_SLOTS:
+  void setAudioConfiguration();
+  void updateAudioDeviceList();
+  void updateSubtitleSettings();
+  void updateVideoSettings();
+
+private Q_SLOTS:
+  void handleMpvEvents();
+  void onRestoreDisplay();
+  void onRefreshRateChange();
+  void onReloadAudio();
+
+Q_SIGNALS:
+  void playing(const QString& url);
+  void buffering(float);
+  // playback has stopped due to a stop() or loadMedia() request
+  void stopped(const QString& url);
+  // playback has stopped because the current media was fully played
+  void finished(const QString& url);
+  // playback has stopped due to any reason - this always happens if the
+  // playing() signal was emitted
+  void playbackEnded(const QString& url);
+  // emitted if playback has ended, and no more items are queued for playback
+  void playbackAllDone();
+  // emitted after playing(), and as soon as the the media is fully loaded, and
+  // playback starts normally
+  void playbackStarting();
+  void paused(bool paused);
+  void windowVisible(bool visible);
+  // emitted as soon as the duration of the current file is known
+  void updateDuration(qint64 milliseconds);
+
+  // an error happened during playback - this implies abort of playback
+  // the id is the (negative) error number, and the message parameter is a short
+  // English description of the error (always the same for the same id, no
+  // further information)
+  void error(int id, const QString& message);
+
+  // current position in ms should be triggered 2 times a second
+  // when position updates
+  void positionUpdate(quint64);
+
+  void onMpvEvents();
+  
+private:
+  // this is the function actually implemented in the backends. the variantmap contains
+  // a few known keys:
+  // * subtitleStreamIndex
+  // * subtitleStreamIdentifier
+  // * audioStreamIndex
+  // * audioStreamIdentifier
+  // * viewOffset
+  //
+  void loadWithOptions(const QVariantMap& options);
+  void setRpiWindow(QQuickWindow* window);
+  void setQtQuickWindow(QQuickWindow* window);
+  void handleMpvEvent(mpv_event *event);
+  // Potentially switch the display refresh rate, and return true if the refresh rate
+  // was actually changed.
+  bool switchDisplayFrameRate();
+  void checkCurrentAudioDevice(const QSet<QString>& old_devs, const QSet<QString>& new_devs);
+
+  mpv::qt::Handle m_mpv;
+
+  double m_lastPositionUpdate;
+  qint64 m_playbackAudioDelay;
+  QString m_CurrentUrl;
+  bool m_playbackStartSent;
+  QQuickWindow* m_window;
+  float m_mediaFrameRate;
+  QTimer m_restoreDisplayTimer;
+  QTimer m_reloadAudioTimer;
+  QSet<QString> m_audioDevices;
+};
+
+#endif // PLAYERCOMPONENT_H
diff --git a/src/player/PlayerQuickItem.cpp b/src/player/PlayerQuickItem.cpp
new file mode 100644
index 0000000..71ccc22
--- /dev/null
+++ b/src/player/PlayerQuickItem.cpp
@@ -0,0 +1,250 @@
+#include "PlayerQuickItem.h"
+
+#include <stdexcept>
+
+#include <QOpenGLContext>
+
+#include <QtGui/QOpenGLFramebufferObject>
+
+#include <QtQuick/QQuickWindow>
+#include <QOpenGLFunctions>
+
+#include "QsLog.h"
+#include "utils/Utils.h"
+
+#ifdef Q_OS_WIN32
+
+#include <windows.h>
+#include <d3d9.h>
+
+typedef IDirect3D9* WINAPI pDirect3DCreate9(UINT);
+
+static IDirect3DDevice9* d3ddevice;
+
+// This must be run before the konvergo main window switches to FS mode.
+void initD3DDevice(void)
+{
+  // Boilerplate for creating a "blank" D3D device.
+  // Most of this is copied from FFmpeg (LGPL).
+  pDirect3DCreate9 *createD3D = NULL;
+  HRESULT hr;
+  D3DPRESENT_PARAMETERS d3dpp = {};
+  D3DDISPLAYMODE        d3ddm;
+  UINT adapter = D3DADAPTER_DEFAULT;
+
+  HMODULE d3dlib = LoadLibraryW(L"d3d9.dll");
+  if (!d3dlib) {
+      QLOG_ERROR() << "Failed to load D3D9 library";
+      return;
+  }
+
+  createD3D = (pDirect3DCreate9 *)GetProcAddress(d3dlib, "Direct3DCreate9");
+  if (!createD3D) {
+      QLOG_ERROR() << "Failed to locate Direct3DCreate9";
+      return;
+  }
+
+  IDirect3D9 *d3d9 = createD3D(D3D_SDK_VERSION);
+  if (!d3d9) {
+      QLOG_ERROR() << "Failed to create IDirect3D object";
+      return;
+  }
+
+  IDirect3D9_GetAdapterDisplayMode(d3d9, adapter, &d3ddm);
+  d3dpp.Windowed         = TRUE;
+  d3dpp.BackBufferWidth  = 640;
+  d3dpp.BackBufferHeight = 480;
+  d3dpp.BackBufferCount  = 0;
+  d3dpp.BackBufferFormat = d3ddm.Format;
+  d3dpp.SwapEffect       = D3DSWAPEFFECT_DISCARD;
+  d3dpp.Flags            = D3DPRESENTFLAG_VIDEO;
+
+  hr = IDirect3D9_CreateDevice(d3d9, adapter, D3DDEVTYPE_HAL, GetShellWindow(),
+                                D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED | D3DCREATE_FPU_PRESERVE,
+                                &d3dpp, &d3ddevice);
+  if (FAILED(hr)) {
+    QLOG_ERROR() << "Failed to create Direct3D device";
+    return;
+  }
+
+  QLOG_INFO() << "Successfully created a Direct3D device";
+};
+
+// Special libmpv-specific pseudo extension for better behavior with OpenGL
+// fullscreen modes. This is needed with some drivers which do not allow the
+// libmpv DXVA code to create a new D3D device.
+static void* __stdcall MPGetD3DInterface(const char* name)
+{
+  QLOG_INFO() << "Asking for " << qPrintable(QString::fromUtf8((name)));
+  if (strcmp(name, "IDirect3DDevice9") == 0)
+  {
+    QLOG_INFO() << "Returning device " << (void *)d3ddevice;
+    IDirect3DDevice9_AddRef(d3ddevice);
+    return (void *)d3ddevice;
+  }
+  return NULL;
+}
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static void* get_proc_address(void* ctx, const char* name)
+{
+  Q_UNUSED(ctx);
+
+  QOpenGLContext* glctx = QOpenGLContext::currentContext();
+  if (!glctx)
+    return NULL;
+
+  void *res = (void *)glctx->getProcAddress(QByteArray(name));
+#ifdef Q_OS_WIN32
+  if (strcmp(name, "glMPGetD3DInterface") == 0)
+  {
+    return (void *)&MPGetD3DInterface;
+  }
+  // wglGetProcAddress(), which is used by Qt, does not always resolve all
+  // builtin functions with all drivers (only extensions). Qt compensates this
+  // for a degree, but does this only for functions Qt happens to need. So
+  // we need our own falback as well.
+  // Warning: this might break if using ANGLE.
+  if (!res)
+  {
+    HMODULE handle = LoadLibrary("opengl32.dll");
+    if (handle)
+    {
+      res = (void *)GetProcAddress(handle, name);
+      FreeLibrary(handle);
+    }
+  }
+#endif
+  return res;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+PlayerRenderer::PlayerRenderer(mpv::qt::Handle mpv, QQuickWindow* window)
+: m_mpv(mpv), m_mpvGL(0), m_window(window), m_size()
+{
+  m_mpvGL = (mpv_opengl_cb_context *)mpv_get_sub_api(m_mpv, MPV_SUB_API_OPENGL_CB);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool PlayerRenderer::init()
+{
+  const char *extensions = "";
+#ifdef Q_OS_WIN32
+  // For the custom IDirect3DDevice9 hack above.
+  extensions = "GL_MP_D3D_interfaces";
+#endif
+  return mpv_opengl_cb_init_gl(m_mpvGL, extensions, get_proc_address, NULL) >= 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+PlayerRenderer::~PlayerRenderer()
+{
+  // Keep in mind that the m_mpv handle must be held until this is done.
+  if (m_mpvGL)
+    mpv_opengl_cb_uninit_gl(m_mpvGL);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerRenderer::render()
+{
+  int fbo = m_window->renderTargetId();
+
+  m_window->resetOpenGLState();
+
+  // The negative height signals to mpv that the video should be flipped
+  // (according to the flipped OpenGL coordinate system).
+  mpv_opengl_cb_draw(m_mpvGL, fbo, m_size.width(), -m_size.height());
+
+  m_window->resetOpenGLState();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerRenderer::swap()
+{
+  mpv_opengl_cb_report_flip(m_mpvGL, 0);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+PlayerQuickItem::PlayerQuickItem(QQuickItem* parent)
+: QQuickItem(parent), m_mpvGL(NULL), m_renderer(NULL)
+{
+  connect(this, &QQuickItem::windowChanged, this, &PlayerQuickItem::onWindowChanged, Qt::DirectConnection);
+  connect(this, &PlayerQuickItem::onFatalError, this, &PlayerQuickItem::onHandleFatalError, Qt::QueuedConnection);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+PlayerQuickItem::~PlayerQuickItem()
+{
+  if (m_mpvGL)
+    mpv_opengl_cb_set_update_callback(m_mpvGL, NULL, NULL);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerQuickItem::onWindowChanged(QQuickWindow* win)
+{
+  if (win)
+  {
+    connect(win, &QQuickWindow::beforeSynchronizing, this, &PlayerQuickItem::onSynchronize, Qt::DirectConnection);
+    connect(win, &QQuickWindow::sceneGraphInvalidated, this, &PlayerQuickItem::onInvalidate, Qt::DirectConnection);
+    connect(this, &PlayerQuickItem::onUpdate, win, &QQuickWindow::update, Qt::QueuedConnection);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerQuickItem::onHandleFatalError(QString message)
+{
+  throw FatalException(message);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerQuickItem::onSynchronize()
+{
+  if (!m_renderer && m_mpv)
+  {
+    m_renderer = new PlayerRenderer(m_mpv, window());
+    if (!m_renderer->init())
+    {
+      delete m_renderer;
+      emit onFatalError(tr("Could not initialize OpenGL."));
+      return;
+    }
+    connect(window(), &QQuickWindow::beforeRendering, m_renderer, &PlayerRenderer::render, Qt::DirectConnection);
+    connect(window(), &QQuickWindow::frameSwapped, m_renderer, &PlayerRenderer::swap, Qt::DirectConnection);
+    window()->setPersistentOpenGLContext(true);
+    window()->setPersistentSceneGraph(true);
+    window()->setClearBeforeRendering(false);
+  }
+  if (m_renderer)
+    m_renderer->m_size = window()->size() * window()->devicePixelRatio();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerQuickItem::onInvalidate()
+{
+  if (m_renderer)
+    delete m_renderer;
+  m_renderer = NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerQuickItem::on_update(void *ctx)
+{
+  PlayerQuickItem *self = (PlayerQuickItem *)ctx;
+  emit self->onUpdate();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PlayerQuickItem::initMpv(PlayerComponent* player)
+{
+  m_mpv = player->getMpvHandle();
+
+  m_mpvGL = (mpv_opengl_cb_context *)mpv_get_sub_api(m_mpv, MPV_SUB_API_OPENGL_CB);
+  if (!m_mpvGL)
+    throw FatalException(tr("OpenGL not enabled in libmpv."));
+
+  mpv_opengl_cb_set_update_callback(m_mpvGL, on_update, (void *)this);
+
+  connect(player, &PlayerComponent::windowVisible, this, &QQuickItem::setVisible);
+  window()->update();
+}
diff --git a/src/player/PlayerQuickItem.h b/src/player/PlayerQuickItem.h
new file mode 100644
index 0000000..0fa10cf
--- /dev/null
+++ b/src/player/PlayerQuickItem.h
@@ -0,0 +1,57 @@
+#ifndef PLAYERQUICKITEM_H
+#define PLAYERQUICKITEM_H
+
+#include <Qt>
+#include <QtQuick/QQuickItem>
+
+#include <mpv/client.h>
+#include <mpv/opengl_cb.h>
+#include <mpv/qthelper.hpp>
+
+#include "PlayerComponent.h"
+
+class PlayerRenderer : public QObject
+{
+  Q_OBJECT
+  friend class PlayerQuickItem;
+
+  PlayerRenderer(mpv::qt::Handle mpv, QQuickWindow* window);
+  bool init();
+  virtual ~PlayerRenderer();
+  void render();
+  void swap();
+
+  mpv::qt::Handle m_mpv;
+  mpv_opengl_cb_context* m_mpvGL;
+  QQuickWindow* m_window;
+  QSize m_size;
+};
+
+class PlayerQuickItem : public QQuickItem
+{
+    Q_OBJECT
+    friend class PlayerRenderer;
+
+public:
+    PlayerQuickItem(QQuickItem* parent = 0);
+    virtual ~PlayerQuickItem();
+    void initMpv(PlayerComponent* player);
+
+signals:
+    void onUpdate();
+    void onFatalError(QString message);
+
+private slots:
+    void onWindowChanged(QQuickWindow* win);
+    void onSynchronize();
+    void onInvalidate();
+    void onHandleFatalError(QString message);
+
+private:
+    static void on_update(void *ctx);
+    mpv::qt::Handle m_mpv;
+    mpv_opengl_cb_context* m_mpvGL;
+    PlayerRenderer* m_renderer;
+};
+
+#endif
diff --git a/src/plugins/RPI_jpeg/QRPIJpegHandler.cpp b/src/plugins/RPI_jpeg/QRPIJpegHandler.cpp
new file mode 100644
index 0000000..5080f40
--- /dev/null
+++ b/src/plugins/RPI_jpeg/QRPIJpegHandler.cpp
@@ -0,0 +1,217 @@
+#include <QVariant>
+#include <QIODevice>
+#include <QImage>
+#include <QColor>
+#include <QDebug>
+#include <QElapsedTimer>
+#include <QDateTime>
+
+#include "QRPIJpegHandler.h"
+
+QT_BEGIN_NAMESPACE
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QRPIJpegHandler::QRPIJpegHandler() : m_quality(100), m_decoder(NULL)
+{
+  setFormat("jpeg");
+
+  // initialize decoder parameters
+  memset(&m_dec_request, 0, sizeof(m_dec_request));
+  m_dec_request.input = encodedInBuf;
+  m_dec_request.output = decodedBuf;
+  m_dec_request.output_handle = 0;
+  m_dec_request.output_alloc_size = MAX_DECODED;
+  m_dec_request.pixel_format = PIXEL_FORMAT_RGBA;
+
+  BRCMJPEG_STATUS_T status = brcmjpeg_create(BRCMJPEG_TYPE_DECODER, &m_decoder);
+  if (status != BRCMJPEG_SUCCESS)
+  {
+    qWarning() << "QRPIJpegHandler : could not create decoder";
+    brcmjpeg_release(m_decoder);
+    m_decoder = NULL;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QRPIJpegHandler::~QRPIJpegHandler()
+{
+  if (m_decoder)
+    brcmjpeg_release(m_decoder);
+
+  m_decoder = NULL;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool QRPIJpegHandler::canRead() const
+{
+  return canRead(device());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool QRPIJpegHandler::canRead(QIODevice* device)
+{
+  if (!device)
+  {
+    qWarning("QRPIJpegHandler::canRead() called with no device");
+    return false;
+  }
+
+  unsigned char buffer[2];
+  if (device->peek((char*)buffer, 2) != 2)
+    return false;
+
+  return uchar(buffer[0]) == 0xff && uchar(buffer[1]) == 0xd8;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool QRPIJpegHandler::read(QImage* image)
+{
+  if (device())
+  {
+
+    m_dec_request.buffer_width = 0;
+    m_dec_request.buffer_height = 0;
+    m_dec_request.input_size = device()->read((char*)encodedInBuf, sizeof(encodedInBuf));
+
+    QElapsedTimer timer;
+    timer.start();
+
+    BRCMJPEG_STATUS_T status = brcmjpeg_process(m_decoder, &m_dec_request);
+
+    if (status == BRCMJPEG_SUCCESS)
+    {
+
+      for (int i = 0; i < m_dec_request.height; i++)
+      {
+        memcpy(image->scanLine(i), decodedBuf + m_dec_request.buffer_width * i * 4,
+               m_dec_request.buffer_width * 4);
+      }
+
+      //*image = decodedImage;
+      qDebug() << QDateTime::currentDateTime().toMSecsSinceEpoch()
+               << "QRPIJpegHandler : decoded a"
+               << m_dec_request.width << "x" << m_dec_request.height
+               << "image in" << timer.elapsed() << "ms";
+
+      return true;
+    }
+    else
+    {
+      qWarning() << "QRPIJpegHandler : Decoding failed with status" << status;
+      return false;
+    }
+
+  }
+  else
+  {
+    qDebug() << "QRPIJpegHandler : read() was called with NULL device";
+    return false;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool QRPIJpegHandler::write(const QImage& image)
+{
+  Q_UNUSED(image);
+  qWarning() << "QRPIJpegHandler : call to unsupported write()";
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool QRPIJpegHandler::supportsOption(ImageOption option) const
+{
+  return option == Quality || option == Size || option == ImageFormat;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool QRPIJpegHandler::readJpegSize(QIODevice* device, QSize& size) const
+{
+  if (canRead(device))
+  {
+    JFIFHEAD header;
+    int bytesRead = device->peek((char*)&header, sizeof(header));
+    if (bytesRead >= (sizeof(header) - JFIF_DATA_SIZE))
+    {
+      BYTE* dataptr = header.data;
+
+      while (dataptr < ((BYTE*)&header + bytesRead))
+      {
+        if (dataptr[0] != 0xFF)
+        {
+          qWarning() << "readJpegSize : got wrong marker " << dataptr[0];
+          return false;
+        }
+
+        // we look for size block marker
+        if (dataptr[1] == 0xC0 && dataptr[2] == 0x0)
+        {
+          size.setWidth(dataptr[8] + dataptr[7] * 256);
+          size.setHeight(dataptr[6] + dataptr[5] * 256);
+          return true;
+        }
+
+        dataptr += dataptr[3] + (dataptr[2] * 256) + 2;
+      }
+    }
+    else
+    {
+       qWarning() << "readJpegSize : could not read " << sizeof(header) << "bytes, read " << bytesRead;
+       return false;
+    }
+  }
+  else
+  {
+    qWarning() << "readJpegSize : device " << device << "can't be read!" ;
+    return false;
+  }
+
+  qWarning() << "readJpegSize : could not find the proper size marker";
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QVariant QRPIJpegHandler::option(ImageOption option) const
+{
+  switch (option)
+  {
+    case Size:
+    {
+      QSize size(0, 0);
+      readJpegSize(device(), size);
+      return QVariant(size);
+      break;
+    }
+
+    case ImageFormat:
+    {
+      return QImage::Format_RGBA8888_Premultiplied;
+    }
+
+    default:
+    {
+      qWarning() << "QRPIJpegHandler : requesting unsupported option" << option;
+      return QVariant();
+      break;
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void QRPIJpegHandler::setOption(ImageOption option, const QVariant& value)
+{
+  switch (option)
+  {
+    case Quality:
+      m_quality = value.toInt();
+      break;
+
+    default:
+      qWarning() << "QRPIJpegHandler : setOption unsupported option" << option << "to" << value;
+      break;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QByteArray QRPIJpegHandler::name() const { return "RPIjpeg"; }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/RPI_jpeg/QRPIJpegHandler.h b/src/plugins/RPI_jpeg/QRPIJpegHandler.h
new file mode 100644
index 0000000..5409625
--- /dev/null
+++ b/src/plugins/RPI_jpeg/QRPIJpegHandler.h
@@ -0,0 +1,70 @@
+#ifndef QRPIJPEGHANDLER_H
+#define QRPIJPEGHANDLER_H
+
+#include <QtGui/qimageiohandler.h>
+#include <QtCore/QSize>
+#include <QtCore/QRect>
+#include "brcmjpeg.h"
+
+QT_BEGIN_NAMESPACE
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// JPEG header struct
+#define JFIF_DATA_SIZE 4096 // additionnal data size for header parsing
+
+typedef unsigned char BYTE;
+
+typedef struct _JFIFHeader
+{
+  BYTE SOI[2];          /* 00h  Start of Image Marker     */
+  BYTE APP0[2];         /* 02h  Application Use Marker    */
+  BYTE Length[2];       /* 04h  Length of APP0 Field      */
+  BYTE Identifier[5];   /* 06h  "JFIF" (zero terminated) Id String */
+  BYTE Version[2];      /* 07h  JFIF Format Revision      */
+  BYTE Units;           /* 09h  Units used for Resolution */
+  BYTE Xdensity[2];     /* 0Ah  Horizontal Resolution     */
+  BYTE Ydensity[2];     /* 0Ch  Vertical Resolution       */
+  BYTE XThumbnail;      /* 0Eh  Horizontal Pixel Count    */
+  BYTE YThumbnail;      /* 0Fh  Vertical Pixel Count      */
+  BYTE data[JFIF_DATA_SIZE];
+} JFIFHEAD;
+
+// Hardware decoder buffers
+#define MAX_WIDTH   5000
+#define MAX_HEIGHT  5000
+#define MAX_ENCODED (15*1024*1024)
+#define MAX_DECODED (MAX_WIDTH*MAX_HEIGHT*2)
+
+static BYTE encodedInBuf[MAX_ENCODED];
+static BYTE decodedBuf[MAX_DECODED];
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// RPI JPEG decoding handling class
+class QRPIJpegHandler : public QImageIOHandler
+{
+public:
+    QRPIJpegHandler();
+    ~QRPIJpegHandler();
+
+    bool canRead() const Q_DECL_OVERRIDE;
+    bool read(QImage *image) Q_DECL_OVERRIDE;
+    bool write(const QImage &image) Q_DECL_OVERRIDE;
+
+    QByteArray name() const Q_DECL_OVERRIDE;
+
+    static bool canRead(QIODevice *device);
+
+    QVariant option(ImageOption option) const Q_DECL_OVERRIDE;
+    void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE;
+    bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE;
+
+private:
+    bool readJpegSize(QIODevice *device, QSize &size) const;
+    int m_quality;
+    BRCMJPEG_REQUEST_T m_dec_request;
+    BRCMJPEG_T *m_decoder;
+};
+
+QT_END_NAMESPACE
+
+#endif // QRPIJPEGHANDLER_H
diff --git a/src/plugins/RPI_jpeg/QRPIJpegPlugin.cpp b/src/plugins/RPI_jpeg/QRPIJpegPlugin.cpp
new file mode 100644
index 0000000..6a27fdb
--- /dev/null
+++ b/src/plugins/RPI_jpeg/QRPIJpegPlugin.cpp
@@ -0,0 +1,36 @@
+#include <QDebug>
+#include "QRPIJpegPlugin.h"
+#include "QRPIJpegHandler.h"
+
+
+QT_BEGIN_NAMESPACE
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QImageIOPlugin::Capabilities QRPIJpegPlugin::capabilities(QIODevice *device, const QByteArray &format) const
+{
+    if (format == "jpeg" || format == "jpg")
+        return Capabilities(CanRead);
+    if (!format.isEmpty())
+        return 0;
+    if (!device->isOpen())
+        return 0;
+
+    Capabilities cap;
+    if (device->isReadable() && QRPIJpegHandler::canRead(device))
+        cap |= CanRead;
+    if (device->isWritable())
+        cap |= CanWrite;
+
+    return cap;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QImageIOHandler *QRPIJpegPlugin::create(QIODevice *device, const QByteArray &format) const
+{
+    QImageIOHandler *handler = new QRPIJpegHandler();
+    handler->setDevice(device);
+    handler->setFormat(format);
+    return handler;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/RPI_jpeg/QRPIJpegPlugin.h b/src/plugins/RPI_jpeg/QRPIJpegPlugin.h
new file mode 100644
index 0000000..0119e35
--- /dev/null
+++ b/src/plugins/RPI_jpeg/QRPIJpegPlugin.h
@@ -0,0 +1,15 @@
+#include <qimageiohandler.h>
+#include <qstringlist.h>
+
+QT_BEGIN_NAMESPACE
+
+class QRPIJpegPlugin : public QImageIOPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QImageIOHandlerFactoryInterface" FILE "jpeg.json")
+public:
+    Capabilities capabilities(QIODevice *device, const QByteArray &format) const Q_DECL_OVERRIDE;
+    QImageIOHandler *create(QIODevice *device, const QByteArray &format = QByteArray()) const Q_DECL_OVERRIDE;
+};
+
+QT_END_NAMESPACE
diff --git a/src/plugins/RPI_jpeg/RPI_jpeg.pro b/src/plugins/RPI_jpeg/RPI_jpeg.pro
new file mode 100644
index 0000000..f3bc45f
--- /dev/null
+++ b/src/plugins/RPI_jpeg/RPI_jpeg.pro
@@ -0,0 +1,30 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2015-05-29T20:58:57
+#
+#-------------------------------------------------
+
+TARGET = RPI_jpeg
+
+
+QT       += core
+
+TEMPLATE = lib
+
+LIBS += -lmmal_core -lmmal_util -lmmal_vc_client
+
+DEFINES += RPI_JPEG_LIBRARY
+
+SOURCES += \
+    QRPIJpegPlugin.cpp \
+    QRPIJpegHandler.cpp \
+    brcmjpeg.cpp
+
+target.path = $$[QT_INSTALL_PLUGINS]/imageformats
+INSTALLS += target
+
+
+HEADERS += \
+    QRPIJpegPlugin.h \
+    QRPIJpegHandler.h \
+    brcmjpeg.h
diff --git a/src/plugins/RPI_jpeg/brcmjpeg.cpp b/src/plugins/RPI_jpeg/brcmjpeg.cpp
new file mode 100644
index 0000000..830d04d
--- /dev/null
+++ b/src/plugins/RPI_jpeg/brcmjpeg.cpp
@@ -0,0 +1,914 @@
+/*
+Copyright (c) 2012, Broadcom Europe Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/** \file
+ *  Jpeg encoder and decoder library using the hardware jpeg codec
+ */
+
+#include "interface/mmal/mmal.h"
+#include "interface/mmal/util/mmal_component_wrapper.h"
+#include "interface/mmal/util/mmal_util_params.h"
+#include "interface/mmal/mmal_logging.h"
+#include "brcmjpeg.h"
+
+/*******************************************************************************
+* Defines
+*******************************************************************************/
+#define MMAL_COMPONENT_IMAGE_DECODE "vc.aggregator.pipeline:ril.image_decode:video_convert"
+#define MMAL_COMPONENT_IMAGE_ENCODE "vc.ril.image_encode"
+
+#define ENABLE_SLICE_MODE 0
+
+#define CHECK_MMAL_STATUS(status, jerr, msg, ...) \
+   if (status != MMAL_SUCCESS) {LOG_ERROR(msg, ## __VA_ARGS__); \
+   err = BRCMJPEG_ERROR_##jerr; goto error;}
+
+/*******************************************************************************
+* Type definitions
+*******************************************************************************/
+struct BRCMJPEG_T
+{
+   BRCMJPEG_TYPE_T type;
+   unsigned int ref_count;
+   unsigned int init;
+
+   MMAL_WRAPPER_T *mmal;
+   unsigned int slice_height;
+
+   VCOS_MUTEX_T lock;
+   VCOS_MUTEX_T process_lock;
+   VCOS_SEMAPHORE_T sema;
+};
+
+/*******************************************************************************
+* Local prototypes
+*******************************************************************************/
+static BRCMJPEG_STATUS_T brcmjpeg_init_encoder(BRCMJPEG_T *);
+static BRCMJPEG_STATUS_T brcmjpeg_init_decoder(BRCMJPEG_T *);
+static BRCMJPEG_STATUS_T brcmjpeg_configure_encoder(BRCMJPEG_T *, BRCMJPEG_REQUEST_T *);
+static BRCMJPEG_STATUS_T brcmjpeg_configure_decoder(BRCMJPEG_T *, BRCMJPEG_REQUEST_T *);
+static BRCMJPEG_STATUS_T brcmjpeg_encode(BRCMJPEG_T *, BRCMJPEG_REQUEST_T *);
+static BRCMJPEG_STATUS_T brcmjpeg_decode(BRCMJPEG_T *, BRCMJPEG_REQUEST_T *);
+static void brcmjpeg_destroy(BRCMJPEG_T *);
+
+static MMAL_FOURCC_T brcmjpeg_pixfmt_to_encoding(BRCMJPEG_PIXEL_FORMAT_T);
+static unsigned int brcmjpeg_copy_pixels(uint8_t *out, unsigned int out_size,
+   const uint8_t *in, unsigned int in_size, BRCMJPEG_PIXEL_FORMAT_T fmt,
+   unsigned int out_width, unsigned int out_height,
+   unsigned int in_width, unsigned int in_height,
+   unsigned int line_offset, unsigned int convert_from);
+
+static BRCMJPEG_T *brcmjpeg_encoder = NULL;
+static BRCMJPEG_T *brcmjpeg_decoder = NULL;
+
+/*******************************************************************************
+* Platform specific code
+*******************************************************************************/
+static VCOS_ONCE_T once = VCOS_ONCE_INIT;
+static VCOS_MUTEX_T brcmjpeg_lock;
+
+static void brcmjpeg_init_once(void)
+{
+   vcos_mutex_create(&brcmjpeg_lock, VCOS_FUNCTION);
+}
+
+#define LOCK() vcos_mutex_lock(&brcmjpeg_lock)
+#define UNLOCK() vcos_mutex_unlock(&brcmjpeg_lock)
+#define LOCK_COMP(ctx) vcos_mutex_lock(&(ctx)->lock)
+#define UNLOCK_COMP(ctx) vcos_mutex_unlock(&(ctx)->lock)
+#define LOCK_PROCESS(ctx) vcos_mutex_lock(&(ctx)->process_lock)
+#define UNLOCK_PROCESS(ctx) vcos_mutex_unlock(&(ctx)->process_lock)
+#define WAIT(ctx) vcos_semaphore_wait(&(ctx)->sema)
+#define SIGNAL(ctx) vcos_semaphore_post(&(ctx)->sema)
+
+/*******************************************************************************
+* Implementation
+*******************************************************************************/
+
+BRCMJPEG_STATUS_T brcmjpeg_create(BRCMJPEG_TYPE_T type, BRCMJPEG_T **ctx)
+{
+   BRCMJPEG_STATUS_T status = BRCMJPEG_SUCCESS;
+   BRCMJPEG_T **comp;
+
+   if (type == BRCMJPEG_TYPE_ENCODER)
+      comp = &brcmjpeg_encoder;
+   else
+      comp = &brcmjpeg_decoder;
+
+   vcos_once(&once, brcmjpeg_init_once);
+   LOCK();
+   if (!*comp)
+   {
+      int init1, init2, init3;
+      *comp = (BRCMJPEG_T*)calloc(sizeof(BRCMJPEG_T), 1);
+      if (!*comp)
+      {
+         UNLOCK();
+         return BRCMJPEG_ERROR_NOMEM;
+      }
+      (*comp)->type = type;
+      init1 = vcos_mutex_create(&(*comp)->lock, "brcmjpeg lock") != VCOS_SUCCESS;
+      init2 = vcos_mutex_create(&(*comp)->process_lock, "brcmjpeg process lock") != VCOS_SUCCESS;
+      init3 = vcos_semaphore_create(&(*comp)->sema, "brcmjpeg sema", 0) != VCOS_SUCCESS;
+      if (init1 | init2 | init3)
+      {
+         if (init1) vcos_mutex_delete(&(*comp)->lock);
+         if (init2) vcos_mutex_delete(&(*comp)->process_lock);
+         if (init3) vcos_semaphore_delete(&(*comp)->sema);
+         free(comp);
+         UNLOCK();
+         return BRCMJPEG_ERROR_NOMEM;
+      }
+   }
+   (*comp)->ref_count++;
+   UNLOCK();
+
+   LOCK_COMP(*comp);
+   if (!(*comp)->init)
+   {
+      if (type == BRCMJPEG_TYPE_ENCODER)
+         status = brcmjpeg_init_encoder(*comp);
+      else
+         status = brcmjpeg_init_decoder(*comp);
+
+      (*comp)->init = status == BRCMJPEG_SUCCESS;
+   }
+   UNLOCK_COMP(*comp);
+
+   if (status != BRCMJPEG_SUCCESS)
+      brcmjpeg_release(*comp);
+
+   *ctx = *comp;
+   return status;
+}
+
+void brcmjpeg_acquire(BRCMJPEG_T *ctx)
+{
+   LOCK_COMP(ctx);
+   ctx->ref_count++;
+   UNLOCK_COMP(ctx);
+}
+
+void brcmjpeg_release(BRCMJPEG_T *ctx)
+{
+   LOCK_COMP(ctx);
+   if (--ctx->ref_count)
+   {
+      UNLOCK_COMP(ctx);
+      return;
+   }
+
+   LOCK();
+   if (ctx->type == BRCMJPEG_TYPE_ENCODER)
+      brcmjpeg_encoder = NULL;
+   else
+      brcmjpeg_decoder = NULL;
+   UNLOCK();
+   UNLOCK_COMP(ctx);
+
+   brcmjpeg_destroy(ctx);
+   return;
+}
+
+BRCMJPEG_STATUS_T brcmjpeg_process(BRCMJPEG_T *ctx, BRCMJPEG_REQUEST_T *req)
+{
+   BRCMJPEG_STATUS_T status;
+
+   /* Sanity check */
+   if ((req->input && req->input_handle) ||
+       (req->output && req->output_handle))
+   {
+      LOG_ERROR("buffer pointer and handle both set (%p/%u %p/%u)",
+            req->input, req->input_handle, req->output, req->output_handle);
+      return BRCMJPEG_ERROR_REQUEST;
+   }
+
+   LOCK_PROCESS(ctx);
+   if (ctx->type == BRCMJPEG_TYPE_ENCODER)
+      status = brcmjpeg_encode(ctx, req);
+   else
+      status = brcmjpeg_decode(ctx, req);
+   UNLOCK_PROCESS(ctx);
+
+   return status;
+}
+
+static void brcmjpeg_destroy(BRCMJPEG_T *ctx)
+{
+   if (ctx->mmal)
+      mmal_wrapper_destroy(ctx->mmal);
+   vcos_mutex_delete(&ctx->lock);
+   vcos_mutex_delete(&ctx->process_lock);
+   vcos_semaphore_delete(&ctx->sema);
+   free(ctx);
+}
+
+static void brcmjpeg_mmal_cb(MMAL_WRAPPER_T *wrapper)
+{
+   BRCMJPEG_T *ctx = (BRCMJPEG_T*)wrapper->user_data;
+   SIGNAL(ctx);
+}
+
+static BRCMJPEG_STATUS_T brcmjpeg_init_encoder(BRCMJPEG_T *ctx)
+{
+   MMAL_STATUS_T status;
+   BRCMJPEG_STATUS_T err = BRCMJPEG_SUCCESS;
+
+   /* Create encoder component */
+   status = mmal_wrapper_create(&ctx->mmal, MMAL_COMPONENT_IMAGE_ENCODE);
+   CHECK_MMAL_STATUS(status, INIT, "failed to create encoder");
+   ctx->mmal->user_data = ctx;
+   ctx->mmal->callback = brcmjpeg_mmal_cb;
+
+   /* Configure things that won't change from encode to encode */
+   mmal_port_parameter_set_boolean(ctx->mmal->control,
+      MMAL_PARAMETER_EXIF_DISABLE, MMAL_TRUE);
+
+   ctx->mmal->output[0]->format->encoding = MMAL_ENCODING_JPEG;
+   status = mmal_port_format_commit(ctx->mmal->output[0]);
+   CHECK_MMAL_STATUS(status, INIT, "failed to commit output port format");
+
+   ctx->mmal->output[0]->buffer_size = ctx->mmal->output[0]->buffer_size_min;
+   ctx->mmal->output[0]->buffer_num = 3;
+   status = mmal_wrapper_port_enable(ctx->mmal->output[0], 0);
+   CHECK_MMAL_STATUS(status, INIT, "failed to enable output port");
+
+   LOG_DEBUG("encoder initialised (output chunk size %i)",
+      ctx->mmal->output[0]->buffer_size);
+   return BRCMJPEG_SUCCESS;
+
+ error:
+   return err;
+}
+
+static BRCMJPEG_STATUS_T brcmjpeg_init_decoder(BRCMJPEG_T *ctx)
+{
+   MMAL_STATUS_T status;
+   BRCMJPEG_STATUS_T err = BRCMJPEG_SUCCESS;
+
+   /* Create decoder component */
+   status = mmal_wrapper_create(&ctx->mmal, MMAL_COMPONENT_IMAGE_DECODE);
+   CHECK_MMAL_STATUS(status, INIT, "failed to create decoder");
+   ctx->mmal->user_data = ctx;
+   ctx->mmal->callback = brcmjpeg_mmal_cb;
+
+   /* Configure things that won't change from decode to decode */
+   ctx->mmal->input[0]->format->encoding = MMAL_ENCODING_JPEG;
+   status = mmal_port_format_commit(ctx->mmal->input[0]);
+   CHECK_MMAL_STATUS(status, INIT, "failed to commit input port format");
+
+   ctx->mmal->input[0]->buffer_size = ctx->mmal->input[0]->buffer_size_min;
+   ctx->mmal->input[0]->buffer_num = 3;
+   status = mmal_wrapper_port_enable(ctx->mmal->input[0], 0);
+   CHECK_MMAL_STATUS(status, INIT, "failed to enable input port");
+
+   LOG_DEBUG("decoder initialised (input chunk size %i)",
+      ctx->mmal->input[0]->buffer_size);
+   return BRCMJPEG_SUCCESS;
+
+ error:
+   return BRCMJPEG_ERROR_INIT;
+}
+
+/* Configuration which needs to be done on a per encode basis */
+static BRCMJPEG_STATUS_T brcmjpeg_configure_encoder(BRCMJPEG_T *ctx,
+   BRCMJPEG_REQUEST_T *req)
+{
+   MMAL_STATUS_T status = MMAL_SUCCESS;
+   MMAL_FOURCC_T encoding = brcmjpeg_pixfmt_to_encoding(req->pixel_format);
+   MMAL_PORT_T *port_in;
+   BRCMJPEG_STATUS_T err = BRCMJPEG_SUCCESS;
+   MMAL_BOOL_T slice_mode = MMAL_FALSE;
+
+   if (encoding == MMAL_ENCODING_UNKNOWN)
+      status = MMAL_EINVAL;
+   CHECK_MMAL_STATUS(status, INPUT_FORMAT, "format not supported (%i)",
+      req->pixel_format);
+
+   if (!req->buffer_width)
+      req->buffer_width = req->width;
+   if (!req->buffer_height)
+      req->buffer_height = req->height;
+   if (req->buffer_width < req->width || req->buffer_height < req->height)
+      status = MMAL_EINVAL;
+   CHECK_MMAL_STATUS(status, INPUT_FORMAT, "invalid buffer width/height "
+      "(%i<=%i %i<=%i)", req->buffer_width, req->width, req->buffer_height,
+      req->height);
+
+   ctx->slice_height = 0;
+   ctx->mmal->status = MMAL_SUCCESS;
+   port_in = ctx->mmal->input[0];
+
+   /* The input port needs to be re-configured to take into account
+    * the properties of the new frame to encode */
+   if (port_in->is_enabled)
+   {
+      status = mmal_wrapper_port_disable(port_in);
+      CHECK_MMAL_STATUS(status, EXECUTE, "failed to disable input port");
+   }
+
+   port_in->format->encoding = encoding;
+   port_in->format->es->video.width =
+      port_in->format->es->video.crop.width = req->width;
+   port_in->format->es->video.height =
+      port_in->format->es->video.crop.height = req->height;
+   port_in->buffer_num = 1;
+
+   if (!req->input_handle &&
+         (port_in->format->encoding == MMAL_ENCODING_I420 ||
+          port_in->format->encoding == MMAL_ENCODING_I422))
+   {
+      if (port_in->format->encoding == MMAL_ENCODING_I420)
+         port_in->format->encoding = MMAL_ENCODING_I420_SLICE;
+      else if (port_in->format->encoding == MMAL_ENCODING_I422)
+         port_in->format->encoding = MMAL_ENCODING_I422_SLICE;
+      slice_mode = MMAL_TRUE;
+      port_in->buffer_num = 3;
+   }
+
+   status = mmal_port_format_commit(port_in);
+   CHECK_MMAL_STATUS(status, INPUT_FORMAT, "failed to commit input port format");
+
+   ctx->slice_height = slice_mode ? 16 : port_in->format->es->video.height;
+   port_in->buffer_size = port_in->buffer_size_min;
+
+   if (req->input_handle)
+      status = mmal_wrapper_port_enable(port_in, MMAL_WRAPPER_FLAG_PAYLOAD_USE_SHARED_MEMORY);
+   else
+      status = mmal_wrapper_port_enable(port_in, MMAL_WRAPPER_FLAG_PAYLOAD_ALLOCATE);
+   CHECK_MMAL_STATUS(status, EXECUTE, "failed to enable input port");
+
+   mmal_port_parameter_set_uint32(ctx->mmal->output[0],
+      MMAL_PARAMETER_JPEG_Q_FACTOR, req->quality);
+
+   if (!ctx->mmal->output[0]->is_enabled)
+   {
+      status = mmal_wrapper_port_enable(ctx->mmal->output[0], 0);
+      CHECK_MMAL_STATUS(status, EXECUTE, "failed to enable output port");
+   }
+
+   LOG_DEBUG("encoder configured (%4.4s:%ux%u|%ux%u slice: %u)",
+      (char *)&port_in->format->encoding,
+      port_in->format->es->video.crop.width, port_in->format->es->video.crop.height,
+      port_in->format->es->video.width, port_in->format->es->video.height,
+      ctx->slice_height);
+   return BRCMJPEG_SUCCESS;
+
+ error:
+   return err;
+}
+
+/* Configuration which needs to be done on a per decode basis */
+static BRCMJPEG_STATUS_T brcmjpeg_configure_decoder(BRCMJPEG_T *ctx,
+   BRCMJPEG_REQUEST_T *req)
+{
+   MMAL_STATUS_T status = MMAL_SUCCESS;
+   MMAL_FOURCC_T encoding = brcmjpeg_pixfmt_to_encoding(req->pixel_format);
+   MMAL_PORT_T *port_out;
+   BRCMJPEG_STATUS_T err = BRCMJPEG_SUCCESS;
+
+   if (encoding != MMAL_ENCODING_I420 &&
+       encoding != MMAL_ENCODING_I422 &&
+       encoding != MMAL_ENCODING_RGBA)
+      status = MMAL_EINVAL;
+   CHECK_MMAL_STATUS(status, OUTPUT_FORMAT, "format not supported");
+
+   ctx->slice_height = 0;
+   ctx->mmal->status = MMAL_SUCCESS;
+   port_out = ctx->mmal->output[0];
+
+   /* The input port needs to be re-configured to take into account
+    * the properties of the new frame to decode */
+   if (port_out->is_enabled)
+   {
+       status = mmal_wrapper_port_disable(port_out);
+       CHECK_MMAL_STATUS(status, EXECUTE, "failed to disable output port");
+   }
+
+   /* We assume that we do not know the format of the new jpeg to be decoded
+    * and configure the input port for autodetecting the new format */
+   port_out->format->encoding = encoding;
+   port_out->format->es->video.width =
+      port_out->format->es->video.crop.width = 0;
+   port_out->format->es->video.height =
+      port_out->format->es->video.crop.height = 0;
+   status = mmal_port_format_commit(port_out);
+   CHECK_MMAL_STATUS(status, OUTPUT_FORMAT, "failed to commit output port format");
+
+   port_out->buffer_num = 1;
+   if (req->output_handle)
+      status = mmal_wrapper_port_enable(port_out, MMAL_WRAPPER_FLAG_PAYLOAD_USE_SHARED_MEMORY);
+   else
+      status = mmal_wrapper_port_enable(port_out, MMAL_WRAPPER_FLAG_PAYLOAD_ALLOCATE);
+   CHECK_MMAL_STATUS(status, EXECUTE, "failed to enable output port");
+
+   LOG_DEBUG("decoder configured (%4.4s:%ux%u|%ux%u)", (char *)&port_out->format->encoding,
+         port_out->format->es->video.crop.width, port_out->format->es->video.crop.height,
+         port_out->format->es->video.width, port_out->format->es->video.height);
+   return BRCMJPEG_SUCCESS;
+
+ error:
+   return err;
+}
+
+static BRCMJPEG_STATUS_T brcmjpeg_encode(BRCMJPEG_T *ctx,
+   BRCMJPEG_REQUEST_T *je)
+{
+   BRCMJPEG_STATUS_T err;
+   MMAL_STATUS_T status = MMAL_SUCCESS;
+   MMAL_BUFFER_HEADER_T *in, *out;
+   MMAL_BOOL_T eos = MMAL_FALSE;
+   const uint8_t *outBuf = je->output;
+   unsigned int loop = 0, slices = 0, outBufSize = je->output_alloc_size;
+   MMAL_PORT_T *port_in = ctx->mmal->input[0];
+   MMAL_PORT_T *port_out = ctx->mmal->output[0];
+
+   je->output_size = 0;
+   err = brcmjpeg_configure_encoder(ctx, je);
+   if (err != BRCMJPEG_SUCCESS)
+      return err;
+
+   /* Then we read the encoded data back from the encoder */
+
+   while (!eos && status == MMAL_SUCCESS)
+   {
+      /* send buffers to be filled */
+      while (mmal_wrapper_buffer_get_empty(port_out, &out, 0) == MMAL_SUCCESS)
+      {
+         out->data = (uint8_t *)outBuf;
+         out->alloc_size = MMAL_MIN(port_out->buffer_size, outBufSize);
+         outBufSize -= out->alloc_size;
+         outBuf += out->alloc_size;
+         status = mmal_port_send_buffer(port_out, out);
+         CHECK_MMAL_STATUS(status, EXECUTE, "failed to send buffer");
+      }
+
+      /* Send slices to be encoded */
+      if (slices * ctx->slice_height < port_in->format->es->video.height &&
+          mmal_wrapper_buffer_get_empty(port_in, &in, 0) == MMAL_SUCCESS)
+      {
+         if (je->input_handle)
+         {
+            in->data = (uint8_t *)je->input_handle;
+            in->length = in->alloc_size = je->input_size;
+         }
+         else
+         {
+            in->length = brcmjpeg_copy_pixels(in->data, in->alloc_size,
+               je->input, je->input_size, je->pixel_format,
+               port_in->format->es->video.width,
+               ctx->slice_height, je->buffer_width, je->buffer_height,
+               slices * ctx->slice_height, 1);
+            if (!in->length)
+               status = MMAL_EINVAL;
+            CHECK_MMAL_STATUS(status, INPUT_BUFFER, "input buffer too small");
+         }
+
+         slices++;
+         if (slices * ctx->slice_height >= port_in->format->es->video.height)
+             in->flags = MMAL_BUFFER_HEADER_FLAG_EOS;
+         status = mmal_port_send_buffer(port_in, in);
+         CHECK_MMAL_STATUS(status, EXECUTE, "failed to send buffer");
+      }
+
+      status = mmal_wrapper_buffer_get_full(port_out, &out, 0);
+      if (status == MMAL_EAGAIN)
+      {
+         status = MMAL_SUCCESS;
+         WAIT(ctx);
+         continue;
+      }
+      CHECK_MMAL_STATUS(status, EXECUTE, "failed to get full buffer");
+
+      LOG_DEBUG("received %i bytes", out->length);
+      je->output_size += out->length;
+      eos = out->flags & MMAL_BUFFER_HEADER_FLAG_EOS;
+
+      /* Detect when the encoder is running out of space for its output */
+      if (++loop >= port_out->buffer_num && !eos && !out->length)
+      {
+         LOG_ERROR("no more output space for encoder");
+         status = MMAL_EINVAL;
+      }
+
+      mmal_buffer_header_release(out);
+   }
+
+   /* Check if buffer was too small */
+   CHECK_MMAL_STATUS(status, OUTPUT_BUFFER, "output buffer too small");
+
+   LOG_DEBUG("encoded W:%ixH:%i:%i (%i bytes) in %i slices",
+         je->width, je->height, je->pixel_format, je->output_size, slices);
+   mmal_port_flush(port_out);
+   return BRCMJPEG_SUCCESS;
+
+ error:
+   mmal_wrapper_port_disable(port_in);
+   mmal_wrapper_port_disable(port_out);
+   return err;
+}
+
+static BRCMJPEG_STATUS_T brcmjpeg_decode(BRCMJPEG_T *ctx,
+   BRCMJPEG_REQUEST_T *jd)
+{
+   BRCMJPEG_STATUS_T err;
+   MMAL_STATUS_T status;
+   MMAL_BUFFER_HEADER_T *in, *out;
+   MMAL_BOOL_T eos = MMAL_FALSE;
+   const uint8_t *inBuf = jd->input;
+   unsigned int slices = 0, inBufSize = jd->input_size;
+   MMAL_PORT_T *port_in = ctx->mmal->input[0];
+   MMAL_PORT_T *port_out = ctx->mmal->output[0];
+   LOG_DEBUG("decode %i bytes", jd->input_size);
+
+   jd->output_size = 0;
+   err = brcmjpeg_configure_decoder(ctx, jd);
+   if (err != BRCMJPEG_SUCCESS)
+      return err;
+
+   while (!eos)
+   {
+      /* Send as many chunks of data to decode as we can */
+      while (inBufSize)
+      {
+         status = mmal_wrapper_buffer_get_empty(port_in, &in, 0);
+         if (status == MMAL_EAGAIN)
+            break;
+         CHECK_MMAL_STATUS(status, EXECUTE, "failed to get empty buffer (%i)", status);
+
+         in->data = (uint8_t *)inBuf;
+         in->length = MMAL_MIN(port_in->buffer_size, inBufSize);
+         in->alloc_size = in->length;
+         inBufSize -= in->length;
+         inBuf += in->length;
+         in->flags = inBufSize ? 0 : MMAL_BUFFER_HEADER_FLAG_EOS;
+         LOG_DEBUG("send decode in (%i bytes)", in->length);
+         status = mmal_port_send_buffer(port_in, in);
+         CHECK_MMAL_STATUS(status, EXECUTE, "failed to send input buffer");
+      }
+
+      /* Check for decoded data */
+      status = mmal_wrapper_buffer_get_full(port_out, &out, 0);
+      if (status == MMAL_EAGAIN)
+      {
+         WAIT(ctx);
+         continue;
+      }
+      CHECK_MMAL_STATUS(status, EXECUTE, "error decoding");
+
+      /* Check if a new format has been auto-detected by the decoder */
+      if (out->cmd == MMAL_EVENT_FORMAT_CHANGED)
+      {
+         MMAL_EVENT_FORMAT_CHANGED_T *event = mmal_event_format_changed_get(out);
+
+         if (event)
+            mmal_format_copy(port_out->format, event->format);
+         mmal_buffer_header_release(out);
+
+         if (!event)
+            status = MMAL_EINVAL;
+         CHECK_MMAL_STATUS(status, EXECUTE, "invalid format change event");
+
+         LOG_DEBUG("new format (%4.4s:%ux%u|%ux%u)", (char *)&event->format->encoding,
+            event->format->es->video.crop.width, event->format->es->video.crop.height,
+            event->format->es->video.width, event->format->es->video.height);
+
+         /* re-setup the output port for the new format */
+         status = mmal_wrapper_port_disable(port_out);
+         CHECK_MMAL_STATUS(status, EXECUTE, "failed to disable output port");
+
+         ctx->slice_height = event->format->es->video.height;
+         if (ENABLE_SLICE_MODE && !jd->output_handle)
+         {
+            /* setup slice mode */
+            if (port_out->format->encoding == MMAL_ENCODING_I420 ||
+               port_out->format->encoding == MMAL_ENCODING_I422)
+            {
+               if (port_out->format->encoding == MMAL_ENCODING_I420)
+                  port_out->format->encoding = MMAL_ENCODING_I420_SLICE;
+               if (port_out->format->encoding == MMAL_ENCODING_I422)
+                  port_out->format->encoding = MMAL_ENCODING_I422_SLICE;
+               ctx->slice_height = 16;
+               port_out->buffer_num = 3;
+            }
+         }
+
+         LOG_DEBUG("using slice size %u", ctx->slice_height);
+         status = mmal_port_format_commit(port_out);
+         CHECK_MMAL_STATUS(status, EXECUTE, "invalid format change event");
+         port_out->buffer_size = port_out->buffer_size_min;
+         if (jd->output_handle)
+            status = mmal_wrapper_port_enable(port_out, MMAL_WRAPPER_FLAG_PAYLOAD_USE_SHARED_MEMORY);
+         else
+            status = mmal_wrapper_port_enable(port_out, MMAL_WRAPPER_FLAG_PAYLOAD_ALLOCATE);
+         CHECK_MMAL_STATUS(status, EXECUTE, "failed to enable output port");
+
+         /* send all our output buffers to the decoder */
+         while (mmal_wrapper_buffer_get_empty(port_out, &out, 0) == MMAL_SUCCESS)
+         {
+            if (jd->output_handle)
+            {
+               out->data = (uint8_t*)jd->output_handle;
+               out->alloc_size = jd->output_alloc_size;
+            }
+            status = mmal_port_send_buffer(port_out, out);
+            CHECK_MMAL_STATUS(status, EXECUTE, "failed to send output buffer");
+         }
+
+         continue;
+      }
+
+      /* We have part of our output frame */
+      jd->width = port_out->format->es->video.crop.width;
+      if (!jd->width)
+         jd->width = port_out->format->es->video.width;
+      if (jd->output_handle)
+         jd->buffer_width = port_out->format->es->video.width;
+      if (!jd->buffer_width)
+         jd->buffer_width = jd->width;
+      jd->height = port_out->format->es->video.crop.height;
+      if (!jd->height)
+         jd->height = port_out->format->es->video.height;
+      if (jd->output_handle)
+         jd->buffer_height = port_out->format->es->video.height;
+      if (!jd->buffer_height)
+         jd->buffer_height = jd->height;
+
+      if (jd->output_handle)
+      {
+         jd->output_size += out->length;
+      }
+      else
+      {
+         jd->output_size = brcmjpeg_copy_pixels(jd->output, jd->output_alloc_size,
+            out->data, out->length, jd->pixel_format,
+            jd->buffer_width, jd->buffer_height,
+            port_out->format->es->video.width,
+            ctx->slice_height, slices * ctx->slice_height, 0);
+         slices++;
+      }
+
+      eos = out->flags & MMAL_BUFFER_HEADER_FLAG_EOS;
+      out->length = 0;
+      if (eos)
+      {
+         mmal_buffer_header_release(out);
+      }
+      else
+      {
+         status = mmal_port_send_buffer(port_out, out);
+         CHECK_MMAL_STATUS(status, EXECUTE, "failed to send output buffer");
+      }
+
+      if (!jd->output_size)
+         status = MMAL_EINVAL;
+      CHECK_MMAL_STATUS(status, OUTPUT_BUFFER, "invalid output buffer");
+   }
+
+   LOG_DEBUG("decoded W:%ixH%i:(W%ixH%i):%i in %i slices",
+      jd->width, jd->height, jd->buffer_width, jd->buffer_height,
+      jd->pixel_format, slices);
+   mmal_port_flush(port_in);
+   return BRCMJPEG_SUCCESS;
+
+ error:
+   mmal_port_flush(port_in);
+   return err;
+}
+
+/*****************************************************************************/
+static struct {
+    BRCMJPEG_PIXEL_FORMAT_T pixel_format;
+    MMAL_FOURCC_T encoding;
+} mmal_raw_conversion[] = {
+    {PIXEL_FORMAT_I420, MMAL_ENCODING_I420},
+    {PIXEL_FORMAT_YV12, MMAL_ENCODING_I420},
+    {PIXEL_FORMAT_I422, MMAL_ENCODING_I422},
+    {PIXEL_FORMAT_YV16, MMAL_ENCODING_I422},
+    {PIXEL_FORMAT_YUYV, MMAL_ENCODING_I422},
+    {PIXEL_FORMAT_RGBA, MMAL_ENCODING_RGBA},
+    {PIXEL_FORMAT_UNKNOWN, MMAL_ENCODING_UNKNOWN} };
+
+static MMAL_FOURCC_T brcmjpeg_pixfmt_to_encoding(BRCMJPEG_PIXEL_FORMAT_T pixel_format)
+{
+   unsigned int i;
+   for (i = 0; mmal_raw_conversion[i].encoding != MMAL_ENCODING_UNKNOWN; i++)
+      if (mmal_raw_conversion[i].pixel_format == pixel_format)
+         break;
+   return mmal_raw_conversion[i].encoding;
+}
+
+// Copy a raw frame from 1 buffer to another, taking care of
+// stride / height differences between the input and output buffers.
+static unsigned int brcmjpeg_copy_pixels(uint8_t *out, unsigned int out_size,
+    const uint8_t *in, unsigned int in_size, BRCMJPEG_PIXEL_FORMAT_T fmt,
+    unsigned int out_width, unsigned int out_height,
+    unsigned int in_width, unsigned int in_height,
+    unsigned int line_offset, unsigned int convert_from)
+{
+    struct {
+        uint8_t *data;
+        unsigned int pitch;
+        unsigned int height;
+    } planes[2][3];
+    unsigned int num_planes = 0;
+    unsigned int i, size = 0;
+    unsigned int in_height_full = in_height;
+    unsigned int out_height_full = out_height;
+    unsigned int k = convert_from ? 1 : 0;
+
+    // Sanity check line_offset
+    if (line_offset >= (convert_from ? in_height : out_height))
+        return 0;
+
+    if (convert_from)
+       in_height -= line_offset;
+    else
+       out_height -= line_offset;
+
+    if (fmt == PIXEL_FORMAT_I420 ||
+        fmt == PIXEL_FORMAT_YV12)
+    {
+       planes[0][0].data = out;
+       planes[0][0].pitch = out_width;
+       planes[0][0].height = out_height;
+
+       planes[1][0].data = (uint8_t *)in;
+       planes[1][0].pitch = in_width;
+       planes[1][0].height = in_height;
+
+       planes[0][1].pitch = planes[0][2].pitch = out_width / 2;
+       planes[0][1].height = planes[0][2].height = out_height / 2;
+       planes[0][1].data = planes[0][0].data + out_width * out_height_full;
+       planes[0][2].data = planes[0][1].data + out_width * out_height_full / 4;
+
+       planes[1][1].pitch = planes[1][2].pitch = in_width / 2;
+       planes[1][1].height = planes[1][2].height = in_height / 2;
+       planes[1][1].data = planes[1][0].data + in_width * in_height_full;
+       planes[1][2].data = planes[1][1].data + in_width * in_height_full / 4;
+
+       if (fmt == PIXEL_FORMAT_YV12)
+       {
+          // We need to swap U and V
+          uint8_t *tmp = planes[1][2].data;
+          planes[1][2].data = planes[1][1].data;
+          planes[1][1].data = tmp;
+       }
+
+       // Add the line offset
+       planes[k][0].data += planes[k][0].pitch * line_offset;
+       planes[k][1].data += planes[k][1].pitch * line_offset/2;
+       planes[k][2].data += planes[k][2].pitch * line_offset/2;
+
+       num_planes = 3;
+       size = out_width * out_height_full * 3 / 2;
+
+       if (in_size < in_width * in_height * 3 / 2)
+          return 0;
+
+   } else if (fmt == PIXEL_FORMAT_I422 ||
+              fmt == PIXEL_FORMAT_YV16 ||
+              fmt == PIXEL_FORMAT_YUYV)
+   {
+      planes[0][0].data = out;
+      planes[0][0].pitch = out_width;
+      planes[0][0].height = out_height;
+
+      planes[1][0].data = (uint8_t *)in;
+      planes[1][0].pitch = in_width;
+      planes[1][0].height = in_height;
+
+      planes[0][1].pitch = planes[0][2].pitch = out_width / 2;
+      planes[0][1].height = planes[0][2].height = out_height;
+      planes[0][1].data = planes[0][0].data + out_width * out_height_full;
+      planes[0][2].data = planes[0][1].data + out_width * out_height_full / 2;
+
+      planes[1][1].pitch = planes[1][2].pitch = in_width / 2;
+      planes[1][1].height = planes[1][2].height = in_height;
+      planes[1][1].data = planes[1][0].data + in_width * in_height_full;
+      planes[1][2].data = planes[1][1].data + in_width * in_height_full / 2;
+
+      // Add the line offset
+      planes[k][0].data += planes[k][0].pitch * line_offset;
+      planes[k][1].data += planes[k][1].pitch * line_offset;
+      planes[k][2].data += planes[k][2].pitch * line_offset;
+      if (fmt == PIXEL_FORMAT_YUYV)
+         planes[k][0].data += planes[k][0].pitch * line_offset;
+
+      if (fmt == PIXEL_FORMAT_YV16)
+      {
+         // We need to swap U and V
+         uint8_t *tmp = planes[1][2].data;
+         planes[1][2].data = planes[1][1].data;
+         planes[1][1].data = tmp;
+      }
+
+      num_planes = 3;
+      size = out_width * out_height_full * 2;
+
+      if (in_size < in_width * in_height * 2)
+         return 0;
+   } else if (fmt == PIXEL_FORMAT_RGBA)
+   {
+       planes[0][0].data = out;
+       planes[0][0].pitch = out_width * 4;
+       planes[0][0].height = out_height;
+
+       planes[1][0].data = (uint8_t *)in;
+       planes[1][0].pitch = in_width * 4;
+       planes[1][0].height = in_height;
+
+       // Add the line offset
+       planes[k][0].data += planes[k][0].pitch * line_offset;
+
+       num_planes = 1;
+       size = out_width * out_height_full * 4;
+
+       if (in_size < in_width * in_height * 4)
+          return 0;
+   }
+
+   if (out_size < size)
+      return 0;
+
+   // Special case for YUYV where don't just copy but convert to/from I422
+   if (fmt == PIXEL_FORMAT_YUYV)
+   {
+      unsigned int width = in_width > out_width ? out_width : in_width;
+      unsigned int height = in_height > out_height ? out_height : in_height;
+      uint8_t *y = planes[convert_from ? 0 : 1][0].data;
+      uint8_t *u = planes[convert_from ? 0 : 1][1].data;
+      uint8_t *v = planes[convert_from ? 0 : 1][2].data;
+      uint8_t *yuyv = planes[convert_from ? 1 : 0][0].data;
+      unsigned int y_diff = (convert_from ? out_width : in_width) - width;
+      unsigned int yuyv_diff = ((convert_from ? in_width : out_width) - width) * 2;
+
+      while (height--)
+      {
+         if (convert_from)
+            for (i = width / 2; i; i--)
+            {
+                *y++ = *yuyv++;
+                *u++ = *yuyv++;
+                *y++ = *yuyv++;
+                *v++ = *yuyv++;
+            }
+         else
+            for (i = width / 2; i; i--)
+            {
+                *yuyv++ = *y++;
+                *yuyv++ = *u++;
+                *yuyv++ = *y++;
+                *yuyv++ = *v++;
+            }
+
+         yuyv += yuyv_diff;
+         y += y_diff;
+         u += y_diff >> 1;
+         v += y_diff >> 1;
+      }
+
+      return size;
+   }
+
+   for (i = 0; i < num_planes; i++)
+   {
+      unsigned int width = MMAL_MIN(planes[0][i].pitch, planes[1][i].pitch);
+      unsigned int height = MMAL_MIN(planes[0][i].height, planes[1][i].height);
+      uint8_t *data_out = planes[0][i].data;
+      uint8_t *data_in = planes[1][i].data;
+
+      while (height--)
+      {
+         memcpy(data_out, data_in, width);
+         data_out += planes[0][i].pitch;
+         data_in += planes[1][i].pitch;
+      }
+   }
+
+   return size;
+}
diff --git a/src/plugins/RPI_jpeg/brcmjpeg.h b/src/plugins/RPI_jpeg/brcmjpeg.h
new file mode 100644
index 0000000..d787e99
--- /dev/null
+++ b/src/plugins/RPI_jpeg/brcmjpeg.h
@@ -0,0 +1,152 @@
+/*
+Copyright (c) 2012, Broadcom Europe Ltd
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the copyright holder nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/** \file
+ *  Jpeg encoder and decoder library using the hardware jpeg codec
+ */
+
+#ifndef BRCM_JPEG_H
+#define BRCM_JPEG_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Status return codes from the API */
+typedef enum
+{
+   BRCMJPEG_SUCCESS = 0,
+   BRCMJPEG_ERROR_NOMEM,
+   BRCMJPEG_ERROR_INIT,
+   BRCMJPEG_ERROR_INPUT_FORMAT,
+   BRCMJPEG_ERROR_OUTPUT_FORMAT,
+   BRCMJPEG_ERROR_INPUT_BUFFER,
+   BRCMJPEG_ERROR_OUTPUT_BUFFER,
+   BRCMJPEG_ERROR_EXECUTE,
+   BRCMJPEG_ERROR_REQUEST,
+} BRCMJPEG_STATUS_T;
+
+/** Type of the codec instance to create */
+typedef enum
+{
+   BRCMJPEG_TYPE_ENCODER = 0,
+   BRCMJPEG_TYPE_DECODER
+} BRCMJPEG_TYPE_T;
+
+/** Pixel formats supported by the codec */
+typedef enum
+{
+   PIXEL_FORMAT_UNKNOWN = 0,
+   PIXEL_FORMAT_I420, /* planar YUV 4:2:0 */
+   PIXEL_FORMAT_YV12, /* planar YVU 4:2:0 */
+   PIXEL_FORMAT_I422, /* planar YUV 4:2:2 */
+   PIXEL_FORMAT_YV16, /* planar YVU 4:2:2 */
+   PIXEL_FORMAT_YUYV, /* interleaved YUV 4:2:2 */
+   PIXEL_FORMAT_RGBA, /* interleaved RGBA */
+} BRCMJPEG_PIXEL_FORMAT_T;
+
+/** Definition of a codec request  */
+typedef struct
+{
+   /** Pointer to the buffer containing the input data
+    * A client should set input OR input_handle, but not both. */
+   const unsigned char *input;
+   /** Actual size of the input data */
+   unsigned int input_size;
+   /** Handle to input buffer containing input data */
+   unsigned int input_handle;
+
+   /** Pointer to the buffer used for the output data
+     * A client should set output OR output_handle, but not both. */
+   unsigned char *output;
+   /** Total size of the output buffer */
+   unsigned int output_alloc_size;
+   /** Actual size of the output data (this is an output parameter) */
+   unsigned int output_size;
+   /** Handle to the buffer used for the output data */
+   unsigned int output_handle;
+
+   /** Width of the raw frame (this is an input parameter for encode) */
+   unsigned int width;
+   /** Height of the raw frame (this is an input parameter for encode) */
+   unsigned int height;
+   /** Pixel format of the raw frame (this is an input parameter) */
+   BRCMJPEG_PIXEL_FORMAT_T pixel_format;
+
+   /** Width of the buffer containing the raw frame (input parameter).
+     * This is optional but if set, is used to specify the actual width
+     * of the buffer containing the raw frame */
+   unsigned int buffer_width;
+   /** Height of the buffer containing the raw frame (input parameter).
+     * This is optional but if set, is used to specify the actual height
+     * of the buffer containing the raw frame */
+   unsigned int buffer_height;
+
+   /** Encode quality - 0 to 100 */
+   unsigned int quality;
+} BRCMJPEG_REQUEST_T;
+
+/** Type of the codec instance */
+typedef struct BRCMJPEG_T BRCMJPEG_T;
+
+/** Create an instance of the jpeg codec
+ * This will actually re-use an existing instance if one is
+ * available.
+ *
+ * @param type type of codec instance required
+ * @param ctx will point to the newly created instance
+ * @return BRCMJPEG_SUCCESS on success
+ */
+BRCMJPEG_STATUS_T brcmjpeg_create(BRCMJPEG_TYPE_T type, BRCMJPEG_T **ctx);
+
+/** Acquire a new reference on a codec instance
+ *
+ * @param ctx instance to acquire a reference on
+ */
+void brcmjpeg_acquire(BRCMJPEG_T *ctx);
+
+/** Release an instance of the jpeg codec
+ * This will only trigger the destruction of the codec instance when
+ * the last reference to it is being released.
+ *
+ * @param ctx instance to release
+ */
+void brcmjpeg_release(BRCMJPEG_T *ctx);
+
+/** Process a jpeg codec request
+ *
+ * @param ctx instance of codec to use
+ * @param request codec request to execute
+ * @return BRCMJPEG_SUCCESS on success
+ */
+BRCMJPEG_STATUS_T brcmjpeg_process(BRCMJPEG_T *ctx, BRCMJPEG_REQUEST_T *request);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* BRCM_JPEG_H */
diff --git a/src/plugins/RPI_jpeg/jpeg.json b/src/plugins/RPI_jpeg/jpeg.json
new file mode 100644
index 0000000..297e4c2
--- /dev/null
+++ b/src/plugins/RPI_jpeg/jpeg.json
@@ -0,0 +1,4 @@
+{
+    "Keys": [ "jpg", "jpeg" ],
+    "MimeTypes": [ "image/jpeg", "image/jpeg" ]
+}
\ No newline at end of file
diff --git a/src/power/CMakeLists.txt b/src/power/CMakeLists.txt
new file mode 100644
index 0000000..bec0514
--- /dev/null
+++ b/src/power/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_sources(PowerComponent.h PowerComponent.cpp)
+
+if(APPLE)
+  add_sources(PowerComponentMac.cpp PowerComponentMac.h)
+endif(APPLE)
+
+if(USE_X11POWER)
+  add_sources(PowerComponentX11.cpp PowerComponentX11.h)
+endif(USE_X11POWER)
+
+if(OPENELEC)
+  add_sources(PowerComponentOE.cpp PowerComponentOE.h)
+endif(OPENELEC)
+
+if(WIN32)
+  add_sources(PowerComponentWin.cpp PowerComponentWin.h)
+endif(WIN32)
diff --git a/src/power/PowerComponent.cpp b/src/power/PowerComponent.cpp
new file mode 100644
index 0000000..23f37e2
--- /dev/null
+++ b/src/power/PowerComponent.cpp
@@ -0,0 +1,97 @@
+//
+// Created by Tobias Hieta on 25/03/15.
+//
+
+#include "PowerComponent.h"
+#include "player/PlayerComponent.h"
+
+#ifdef Q_OS_MAC
+#include "PowerComponentMac.h"
+#elif KONVERGO_OPENELEC
+#include "PowerComponentOE.h"
+#elif USE_X11POWER
+#include "PowerComponentX11.h"
+#elif defined(Q_OS_WIN32)
+#include "PowerComponentWin.h"
+#endif
+
+/////////////////////////////////////////////////////////////////////////////////////////
+PowerComponent& PowerComponent::Get()
+{
+#ifdef Q_OS_MAC
+  static PowerComponentMac instance;
+  return instance;
+#elif KONVERGO_OPENELEC
+  static PowerComponentOE instance;
+  return instance;
+#elif USE_X11POWER
+  static PowerComponentX11 instance;
+  return instance;
+#elif defined(Q_OS_WIN32)
+  static PowerComponentWin instance;
+  return instance;
+#else
+  QLOG_WARN() << "Could not find a power component matching this platform. OS screensaver control disabled.";
+
+  static PowerComponent instance;
+  return instance;
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool PowerComponent::componentInitialize()
+{
+  PlayerComponent* player = &PlayerComponent::Get();
+  if (!player)
+    return false;
+
+  connect(player, &PlayerComponent::playing, this, &PowerComponent::playbackStarted);
+  connect(player, &PlayerComponent::playbackEnded, this, &PowerComponent::playbackEnded);
+
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponent::setFullscreenState(bool fullscreen)
+{
+  m_fullscreenState = fullscreen;
+  redecideScreeensaverState();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponent::redecideScreeensaverState()
+{
+  bool enable_os_screensaver = !m_fullscreenState && !m_videoPlaying;
+  if (m_currentScreensaverEnabled != enable_os_screensaver)
+  {
+    m_currentScreensaverEnabled = enable_os_screensaver;
+    if (enable_os_screensaver)
+    {
+      QLOG_DEBUG() << "Enabling OS screensaver";
+      doEnableScreensaver();
+      emit screenSaverEnabled();
+    }
+    else
+    {
+      QLOG_DEBUG() << "Disabling OS screensaver";
+      doDisableScreensaver();
+      emit screenSaverDisabled();
+    }
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponent::playbackStarted()
+{
+  m_videoPlaying = true;
+  redecideScreeensaverState();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponent::playbackEnded()
+{
+  m_videoPlaying = false;
+  redecideScreeensaverState();
+}
+
+
diff --git a/src/power/PowerComponent.h b/src/power/PowerComponent.h
new file mode 100644
index 0000000..b3c9407
--- /dev/null
+++ b/src/power/PowerComponent.h
@@ -0,0 +1,58 @@
+#ifndef POWERMANAGER
+#define POWERMANAGER
+
+#include <QsLog.h>
+#include "ComponentManager.h"
+
+class PowerComponent : public ComponentBase
+{
+  Q_OBJECT
+public:
+  static PowerComponent& Get();
+
+  PowerComponent(QObject* parent = 0)
+  : ComponentBase(parent),
+    m_currentScreensaverEnabled(true),
+    m_fullscreenState(false),
+    m_videoPlaying(false)
+    { }
+
+  virtual bool componentInitialize();
+  virtual bool componentExport() { return true; }
+  virtual const char* componentName() { return "power"; }
+
+  void setFullscreenState(bool fullscreen);
+
+public Q_SLOTS:
+  virtual bool canPowerOff() { return false; }
+  virtual bool canReboot() { return false; }
+  virtual bool canSuspend() { return false; }
+  virtual bool canRelaunch() { return false; }
+
+  virtual bool PowerOff() { return false; }
+  virtual bool Reboot() { return false; }
+  virtual bool Suspend() { return false; }
+
+private Q_SLOTS:
+  void playbackStarted();
+  void playbackEnded();
+
+Q_SIGNALS:
+  void screenSaverEnabled();
+  void screenSaverDisabled();
+
+protected:
+  virtual void doDisableScreensaver() {};
+  virtual void doEnableScreensaver() {};
+
+private:
+  void redecideScreeensaverState();
+
+  bool m_currentScreensaverEnabled;
+  bool m_fullscreenState;
+  bool m_videoPlaying;
+};
+
+
+#endif // POWERMANAGER
+
diff --git a/src/power/PowerComponentMac.cpp b/src/power/PowerComponentMac.cpp
new file mode 100644
index 0000000..0749dbe
--- /dev/null
+++ b/src/power/PowerComponentMac.cpp
@@ -0,0 +1,24 @@
+#include "PowerComponentMac.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentMac::doDisableScreensaver()
+{
+  if (m_assertion == 0)
+  {
+    CFStringRef why = CFSTR("tv.plex.player");
+    IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep,
+                                kIOPMAssertionLevelOn,
+                                why,
+                                &m_assertion);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentMac::doEnableScreensaver()
+{
+  if (m_assertion != 0)
+  {
+    IOPMAssertionRelease(m_assertion);
+    m_assertion = 0;
+  }
+}
diff --git a/src/power/PowerComponentMac.h b/src/power/PowerComponentMac.h
new file mode 100644
index 0000000..1e1c776
--- /dev/null
+++ b/src/power/PowerComponentMac.h
@@ -0,0 +1,18 @@
+#ifndef POWERCOMPONENTMAC_H
+#define POWERCOMPONENTMAC_H
+
+#include "PowerComponent.h"
+#include <IOKit/pwr_mgt/IOPMLib.h>
+
+class PowerComponentMac : public PowerComponent
+{
+public:
+  PowerComponentMac() : PowerComponent(0), m_assertion(0) { }
+  virtual void doDisableScreensaver();
+  virtual void doEnableScreensaver();
+
+private:
+  IOPMAssertionID m_assertion = 0;
+};
+
+#endif // POWERCOMPONENTMAC_H
diff --git a/src/power/PowerComponentOE.cpp b/src/power/PowerComponentOE.cpp
new file mode 100644
index 0000000..de6171d
--- /dev/null
+++ b/src/power/PowerComponentOE.cpp
@@ -0,0 +1,81 @@
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusInterface>
+#include <QtDBus/QDBusReply>
+
+#include "PowerComponentOE.h"
+
+#define DBUS_SERVICE_NAME "org.freedesktop.login1"
+#define DBUS_SERVICE_PATH "/org/freedesktop/login1"
+#define DBUS_INTERFACE "org.freedesktop.login1.Manager"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool PowerComponentOE::callPowerMethod(QString method)
+{
+  if (QDBusConnection::systemBus().isConnected())
+  {
+    QDBusInterface iface(DBUS_SERVICE_NAME, DBUS_SERVICE_PATH, DBUS_INTERFACE,
+                         QDBusConnection::systemBus());
+
+    if (iface.isValid())
+    {
+      QDBusReply<bool> reply = iface.call(method, true);
+
+      if (reply.isValid())
+      {
+        return true;
+      }
+      else
+      {
+        QLOG_ERROR() << "callPowerMethod : Error while calling" << method << ":"
+                     << reply.error().message();
+        return false;
+      }
+    }
+    else
+    {
+      QLOG_ERROR() << "callPowerMethod : failed to retrieve interface.";
+    }
+  }
+  else
+  {
+    QLOG_ERROR() << "callPowerMethod : could not find system bus";
+  }
+
+  return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool PowerComponentOE::isPowerMethodAvailable(QString method)
+{
+  if (QDBusConnection::systemBus().isConnected())
+  {
+    QDBusInterface iface(DBUS_SERVICE_NAME, DBUS_SERVICE_PATH, DBUS_INTERFACE,
+                         QDBusConnection::systemBus());
+
+    if (iface.isValid())
+    {
+      QDBusReply<QString> reply = iface.call(method);
+
+      if (reply.isValid())
+      {
+        return (reply.value() == "yes");
+      }
+      else
+      {
+        QLOG_ERROR() << "isPowerMethodAvailable : Error while calling" << method << ":"
+                     << reply.error().message();
+        return false;
+      }
+    }
+    else
+    {
+      QLOG_ERROR() << "isPowerMethodAvailable : failed to retrieve interface.";
+    }
+  }
+  else
+  {
+    QLOG_ERROR() << "isPowerMethodAvailable : could not find system bus";
+  }
+
+  return false;
+}
diff --git a/src/power/PowerComponentOE.h b/src/power/PowerComponentOE.h
new file mode 100644
index 0000000..73fe36c
--- /dev/null
+++ b/src/power/PowerComponentOE.h
@@ -0,0 +1,27 @@
+#ifndef POWERCOMPONENTOE_H
+#define POWERCOMPONENTOE_H
+
+#include "PowerComponent.h"
+
+class PowerComponentOE : public PowerComponent
+{
+  public:
+    PowerComponentOE() : PowerComponent(0) {};
+    ~PowerComponentOE() {};
+
+  public Q_SLOTS:
+    virtual bool canPowerOff() { return isPowerMethodAvailable("CanPowerOff"); }
+    virtual bool canReboot() { return isPowerMethodAvailable("CanReboot"); }
+    virtual bool canSuspend() { return isPowerMethodAvailable("CanSuspend"); }
+    virtual bool canRelaunch() { return true; }
+
+    virtual bool PowerOff() { return callPowerMethod("PowerOff"); }
+    virtual bool Reboot() { return callPowerMethod("Reboot"); }
+    virtual bool Suspend() { return callPowerMethod("Suspend"); }
+
+  private:
+    bool callPowerMethod(QString method);
+    bool isPowerMethodAvailable(QString method);
+};
+
+#endif // POWERCOMPONENTOE_H
diff --git a/src/power/PowerComponentWin.cpp b/src/power/PowerComponentWin.cpp
new file mode 100644
index 0000000..145f5f1
--- /dev/null
+++ b/src/power/PowerComponentWin.cpp
@@ -0,0 +1,15 @@
+#include <windows.h>
+
+#include "PowerComponentWin.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentWin::doDisableScreensaver()
+{
+  SetThreadExecutionState(ES_CONTINUOUS | ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentWin::doEnableScreensaver()
+{
+  SetThreadExecutionState(ES_CONTINUOUS);
+}
diff --git a/src/power/PowerComponentWin.h b/src/power/PowerComponentWin.h
new file mode 100644
index 0000000..4d46470
--- /dev/null
+++ b/src/power/PowerComponentWin.h
@@ -0,0 +1,14 @@
+#ifndef POWERCOMPONENTWIN_H
+#define POWERCOMPONENTWIN_H
+
+#include "PowerComponent.h"
+
+class PowerComponentWin : public PowerComponent
+{
+public:
+  PowerComponentWin() : PowerComponent(0) { }
+  virtual void doDisableScreensaver();
+  virtual void doEnableScreensaver();
+};
+
+#endif // POWERCOMPONENTWIN_H
diff --git a/src/power/PowerComponentX11.cpp b/src/power/PowerComponentX11.cpp
new file mode 100644
index 0000000..6f18da6
--- /dev/null
+++ b/src/power/PowerComponentX11.cpp
@@ -0,0 +1,55 @@
+#include <stdlib.h>
+
+#include "PowerComponentX11.h"
+#include "QsLog.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+PowerComponentX11::PowerComponentX11() : PowerComponent(0)
+{
+  m_timer = new QTimer(this);
+  connect(m_timer, &QTimer::timeout, this, &PowerComponentX11::onTimer);
+  m_timer->setInterval(15 * 1000);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentX11::onTimer()
+{
+  if (!m_process && !m_broken)
+  {
+    m_process = new QProcess(this);
+    m_process->setProcessChannelMode(QProcess::ForwardedChannels);
+    connect(m_process, (void (QProcess::*)(int,QProcess::ExitStatus))&QProcess::finished,
+            this, &PowerComponentX11::onProcessFinished);
+    connect(m_process, (void (QProcess::*)(QProcess::ProcessError))&QProcess::error,
+            this, &PowerComponentX11::onProcessError);
+    m_process->start("xdg-screensaver", {"reset"});
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentX11::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+  if (m_process)
+    m_process->deleteLater();
+  m_process = 0;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentX11::onProcessError(QProcess::ProcessError error)
+{
+  QLOG_ERROR() << "Disabling screensaver is not working. Make sure xdg-screensaver is installed.";
+  m_broken = true;
+  onProcessFinished(-1, QProcess::CrashExit);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentX11::doDisableScreensaver()
+{
+  m_timer->start();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void PowerComponentX11::doEnableScreensaver()
+{
+  m_timer->stop();
+}
diff --git a/src/power/PowerComponentX11.h b/src/power/PowerComponentX11.h
new file mode 100644
index 0000000..ff1dac9
--- /dev/null
+++ b/src/power/PowerComponentX11.h
@@ -0,0 +1,31 @@
+#ifndef POWERCOMPONENTX11_H
+#define POWERCOMPONENTX11_H
+
+#include <QTimer>
+#include <QProcess>
+
+#include "PowerComponent.h"
+
+class PowerComponentX11 : public PowerComponent
+{
+  Q_OBJECT
+
+public:
+  PowerComponentX11();
+
+protected:
+  virtual void doDisableScreensaver();
+  virtual void doEnableScreensaver();
+
+private slots:
+  void onTimer();
+  void onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
+  void onProcessError(QProcess::ProcessError error);
+
+private:
+  bool m_broken = false;
+  QTimer* m_timer = 0;
+  QProcess* m_process = 0;
+};
+
+#endif // POWERCOMPONENTX11_H
diff --git a/src/remote/CMakeLists.txt b/src/remote/CMakeLists.txt
new file mode 100644
index 0000000..cd21d51
--- /dev/null
+++ b/src/remote/CMakeLists.txt
@@ -0,0 +1,3 @@
+find_all_sources(. REMOTE_SRCS)
+add_sources(${REMOTE_SRCS})
+
diff --git a/src/remote/GDMManager.cpp b/src/remote/GDMManager.cpp
new file mode 100644
index 0000000..3684039
--- /dev/null
+++ b/src/remote/GDMManager.cpp
@@ -0,0 +1,79 @@
+#include "GDMManager.h"
+
+#include <QUdpSocket>
+#include <QHostInfo>
+
+#include "settings/SettingsComponent.h"
+#include "QsLog.h"
+#include "RemoteComponent.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+GDMManager::GDMManager(QObject *parent) : QObject(parent), m_port(-1)
+{
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void GDMManager::startAnnouncing()
+{
+  startListener();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void GDMManager::stopAnnouncing()
+{
+  m_socket.close();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void GDMManager::startListener()
+{
+  m_socket.bind(QHostAddress::AnyIPv4, 32412, QUdpSocket::ReuseAddressHint | QUdpSocket::ShareAddress);
+
+  QHostAddress multicast("239.0.0.250");
+  m_socket.joinMulticastGroup(multicast);
+
+  connect(&m_socket, &QUdpSocket::readyRead, this, &GDMManager::readData);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void GDMManager::readData()
+{
+  while (m_socket.hasPendingDatagrams())
+  {
+    QByteArray datagram;
+    datagram.resize(m_socket.pendingDatagramSize());
+
+    QHostAddress sender;
+    quint16 senderPort;
+
+    m_socket.readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
+    parseData(datagram, sender, senderPort);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void GDMManager::parseData(const QByteArray& data, const QHostAddress& sender, quint16 port)
+{
+  if (data.startsWith("M-SEARCH *"))
+    m_socket.writeDatagram(getPacket(), sender, port);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QByteArray GDMManager::getPacket()
+{
+  QByteArray packetData;
+
+  // Header
+  packetData.append("HTTP/1.0 200 OK\r\n");
+  packetData.append("Content-Type: plex/media-player\r\n");
+
+  QVariantMap headers = RemoteComponent::GDMInformation();
+
+  foreach (const QString& key, headers.keys())
+    packetData.append(key + ": " + headers[key].toString() + "\r\n");
+
+  // terminate header
+  packetData.append("\r\n");
+  
+  return packetData;
+}
\ No newline at end of file
diff --git a/src/remote/GDMManager.h b/src/remote/GDMManager.h
new file mode 100644
index 0000000..2853ec2
--- /dev/null
+++ b/src/remote/GDMManager.h
@@ -0,0 +1,30 @@
+#ifndef GDMANNOUNCER_H
+#define GDMANNOUNCER_H
+
+#include <QObject>
+#include <QUdpSocket>
+#include <qbytearray.h>
+#include <qhostaddress.h>
+#include <qglobal.h>
+
+class GDMManager : public QObject
+{
+  Q_OBJECT
+public:
+  explicit GDMManager(QObject *parent = 0);
+  ~GDMManager() { stopAnnouncing(); }
+  void startAnnouncing();
+  void stopAnnouncing();
+
+private:
+  void startListener();
+  void parseData(const QByteArray& data, const QHostAddress& sender, quint16 port);
+  void readData();
+
+  QByteArray getPacket();
+
+  QUdpSocket m_socket;
+  qint32 m_port;
+};
+
+#endif // GDMANNOUNCER_H
diff --git a/src/remote/RemoteComponent.cpp b/src/remote/RemoteComponent.cpp
new file mode 100644
index 0000000..c704bad
--- /dev/null
+++ b/src/remote/RemoteComponent.cpp
@@ -0,0 +1,527 @@
+//
+// Created by Tobias Hieta on 24/03/15.
+//
+
+#include "RemoteComponent.h"
+
+#include <QXmlStreamWriter>
+#include <QUrlQuery>
+
+#include "QsLog.h"
+#include "settings/SettingsComponent.h"
+#include "utils/Utils.h"
+#include "Version.h"
+
+static QMap<QString, QString> resourceKeyMap = {
+  { "Name", "title" },
+  { "Resource-Identifier", "machineIdentifier" },
+  { "Product", "product" },
+  { "Version", "version" },
+  { "Protocol-Version", "protocolVersion" },
+  { "Protocol-Capabilities", "protocolCapabilities" },
+  { "Device-Class", "deviceClass" }
+};
+
+static QMap<QString, QString> headerKeyMap = {
+  { "Name", "X-Plex-Device-Name" },
+  { "Resource-Identifier", "X-Plex-Client-Identifier" },
+  { "Product", "X-Plex-Product" },
+  { "Version", "X-Plex-Version" }
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////
+RemoteComponent::RemoteComponent(QObject* parent) : ComponentBase(parent), m_commandId(0)
+{
+  m_gdmManager = new GDMManager(this);
+  m_networkAccessManager = new QNetworkAccessManager(this);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool RemoteComponent::componentInitialize()
+{
+  m_gdmManager->startAnnouncing();
+
+  // check for timed out subscribers
+  m_subscriberTimer.setInterval(5000);
+  connect(&m_subscriberTimer, &QTimer::timeout, this, &RemoteComponent::checkSubscribers);
+  m_subscriberTimer.start();
+
+  // connect the network access stuff
+  connect(m_networkAccessManager, &QNetworkAccessManager::finished, this, &RemoteComponent::timelineFinished);
+
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QVariantMap RemoteComponent::HeaderInformation()
+{
+  QVariantMap gdmInfo = GDMInformation();
+  QVariantMap headerInfo;
+
+  foreach (const QString& key, gdmInfo.keys())
+  {
+    if (headerKeyMap.contains(key))
+      headerInfo[headerKeyMap[key]] = gdmInfo[key];
+  }
+
+  headerInfo["X-Plex-Platform"] = QSysInfo::productType();
+  headerInfo["X-Plex-Platform-Version"] = QSysInfo::productVersion();
+  
+  return headerInfo;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QVariantMap RemoteComponent::ResourceInformation()
+{
+  QVariantMap gdmInfo = GDMInformation();
+  QVariantMap resourceInfo;
+
+  foreach (const QString& key, gdmInfo.keys())
+  {
+    if (resourceKeyMap.contains(key))
+      resourceInfo[resourceKeyMap[key]] = gdmInfo[key];
+  }
+
+  resourceInfo["platform"] = QSysInfo::productType();
+  resourceInfo["platformVersion"] = QSysInfo::productVersion();
+
+  return resourceInfo;
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QVariantMap RemoteComponent::GDMInformation()
+{
+  QVariantMap headers = {
+    {"Name", Utils::ComputerName()},
+    {"Port", SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "webserverport")},
+    {"Version", Version::GetVersionString()},
+    {"Product", "Plex Media Player"},
+    {"Protocol", "plex"},
+    {"Protocol-Version", "1"},
+    {"Protocol-Capabilities", "navigation,playback,timeline,mirror,playqueues"},
+    {"Device-Class", "PC"},
+    {"Resource-Identifier", SettingsComponent::Get().value(SETTINGS_SECTION_WEBCLIENT, "clientID")}
+  };
+
+  return headers;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::handleResource(QHttpRequest* request, QHttpResponse* response)
+{
+  if (request->method() == QHttpRequest::HTTP_GET)
+  {
+    QVariantMap headers = ResourceInformation();
+
+    QByteArray outputData;
+    QXmlStreamWriter output(&outputData);
+    output.setAutoFormatting(true);
+    output.writeStartDocument();
+    output.writeStartElement("MediaContainer");
+    output.writeStartElement("Player");
+
+    foreach (const QString& key, headers.keys())
+      output.writeAttribute(key, headers[key].toString());
+
+    output.writeEndElement();
+    output.writeEndDocument();
+
+    response->writeHead(QHttpResponse::STATUS_OK);
+    response->write(outputData);
+    response->end();
+  }
+  else
+  {
+    response->writeHead(QHttpResponse::STATUS_METHOD_NOT_ALLOWED);
+    response->end();
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QVariantMap RemoteComponent::QueryToMap(const QUrl& url)
+{
+  QUrlQuery query(url);
+  QVariantMap queryMap;
+
+  QPair<QString, QString> stringPair;
+
+  foreach (stringPair, query.queryItems())
+  {
+    QString key = stringPair.first;
+    QString value = stringPair.second;
+
+    QVariantList l;
+    if (queryMap.contains(key))
+    {
+      l = queryMap[key].toList();
+      l.append(value);
+    }
+    else
+    {
+      l.append(value);
+    }
+    queryMap[key] = l;
+  }
+
+  return queryMap;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QVariantMap RemoteComponent::HeaderToMap(const HeaderHash& hash)
+{
+  QVariantMap variantMap;
+  foreach (const QString& key, hash.keys())
+    variantMap[key] = hash[key];
+  return variantMap;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::handleCommand(QHttpRequest* request, QHttpResponse* response)
+{
+
+  QVariantMap queryMap = QueryToMap(request->url());
+  QVariantMap headerMap = HeaderToMap(request->headers());
+  QString identifier = headerMap["x-plex-client-identifier"].toString();
+
+  response->setHeader("Access-Control-Allow-Origin", "*");
+  response->setHeader("X-Plex-Client-Identifier",  SettingsComponent::Get().value(SETTINGS_SECTION_WEBCLIENT, "clientID").toString());
+
+  // handle CORS requests here
+  if ((request->method() == QHttpRequest::HTTP_OPTIONS) && headerMap.contains("access-control-request-method"))
+  {    
+    response->setHeader("Content-Type", "text/plain");
+    response->setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT, HEAD");
+    response->setHeader("Access-Control-Max-Age", "1209600");
+    response->setHeader("Connection", "close");
+
+    if (headerMap.contains("access-control-request-headers"))
+    {
+      response->setHeader("Access-Control-Allow-Headers", headerMap["access-control-request-headers"].toString());
+    }
+
+    response->writeHead(QHttpResponse::STATUS_OK);
+    response->end();
+    return;
+  }
+
+  // we want to handle the subscription events in the host
+  // since we are going to handle the updating later.
+  //
+  if (request->path() == "/player/timeline/subscribe")
+  {
+    handleSubscription(request, response, false);
+    return;
+  }
+  else if (request->path() == "/player/timeline/unsubscribe")
+  {
+    subscriberRemove(request->headers()["x-plex-client-identifier"]);
+    response->writeHead(QHttpResponse::STATUS_OK);
+    response->end();
+    return;
+  }
+  else if ((request->path() == "/player/timeline/poll"))
+  {
+    if (m_subscriberMap.contains(identifier) == false)
+      handleSubscription(request, response, true);
+
+    RemotePollSubscriber *subscriber = (RemotePollSubscriber *)m_subscriberMap[identifier];
+    subscriber->reSubscribe();
+    subscriber->setHTTPResponse(response);
+
+    // if we don't have to wait, just ship the update right away
+    // otherwise, this will wait until next update
+    if (!(queryMap.contains("wait") && ( queryMap["wait"].toList()[0].toInt() == 1)))
+    {
+     subscriber->sendUpdate();
+    }
+
+    return;
+  }
+
+
+  // handle commandID
+  if (headerMap.contains("x-plex-client-identifier") == false || queryMap.contains("commandID") == false)
+  {
+    QLOG_WARN() << "Can't find a X-Plex-Client-Identifier header";
+    response->writeHead(QHttpResponse::STATUS_NOT_ACCEPTABLE);
+    response->end();
+    return;
+  }
+
+  quint64 commandId = 0;
+  {
+    QMutexLocker lk(&m_responseLock);
+    commandId = ++m_commandId;
+    m_responseMap[commandId] = response;
+
+    connect(response, &QHttpResponse::done, this, &RemoteComponent::responseDone);
+  }
+
+  {
+    QMutexLocker lk(&m_subscriberLock);
+    if (m_subscriberMap.contains(identifier) == false)
+    {
+      QLOG_WARN() << "Failed to lock up subscriber" << identifier;
+      response->writeHead(QHttpResponse::STATUS_NOT_ACCEPTABLE);
+      response->end();
+      return;
+    }
+
+    RemoteSubscriber* subscriber = m_subscriberMap[identifier];
+    subscriber->setCommandId(m_commandId, queryMap["commandID"].toList()[0].toInt());
+  }
+
+  QVariantMap arg = {
+    { "method", request->methodString() },
+    { "headers", headerMap },
+    { "path", request->path() },
+    { "query", queryMap },
+    { "commandID", m_commandId}
+  };
+
+  emit commandReceived(arg);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::responseDone()
+{
+  QHttpResponse* response = dynamic_cast<QHttpResponse*>(sender());
+  if (response)
+  {
+    QMutexLocker lk(&m_responseLock);
+
+    int foundId = -1;
+    foreach(int responseId, m_responseMap.keys())
+    {
+      if (m_responseMap[responseId] == response)
+      {
+        foundId = responseId;
+        break;
+      }
+    }
+
+    if (foundId != -1)
+      m_responseMap.remove(foundId);
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::commandResponse(const QVariantMap& responseArguments)
+{
+  // check for minimum requirements in the responseArguments
+  if (responseArguments.contains("commandID") == false ||
+      responseArguments.contains("responseCode") == false)
+  {
+    QLOG_WARN() << "responseArguments did not contain a commandId or responseCode";
+    return;
+  }
+
+  quint64 commandId = responseArguments["commandID"].toULongLong();
+  uint responseCode = responseArguments["responseCode"].toUInt();
+
+  QMutexLocker lk(&m_responseLock);
+  if (m_responseMap.contains(commandId) == false)
+  {
+    QLOG_WARN() << "Could not find responseId:" << commandId << " - maybe it was removed because of a timeout?";
+    return;
+  }
+
+  QHttpResponse* response = m_responseMap[commandId];
+
+  // no need to hold the lock when we have changed m_responseMap
+  lk.unlock();
+
+  // add headers if we have them
+  if (responseArguments.contains("headers") && responseArguments["headers"].type() == QVariant::Map)
+  {
+    QVariantMap headers = responseArguments["headers"].toMap();
+      foreach (const QString& key, headers.keys())
+        response->setHeader(key, headers[key].toString());
+  }
+
+  // write the response HTTP code
+  response->writeHead(responseCode);
+
+  // handle optional body argument
+  if (responseArguments.contains("body") && responseArguments["body"].type() == QVariant::String)
+    response->write(responseArguments["body"].toString().toUtf8());
+
+  response->end();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::handleSubscription(QHttpRequest* request, QHttpResponse* response, bool poll)
+{
+  QVariantMap headers = HeaderToMap(request->headers());
+
+  // check for required headers
+  if (headers.contains("x-plex-client-identifier") == false ||
+      headers.contains("x-plex-device-name") == false)
+  {
+    QLOG_ERROR() << "Missing X-Plex headers in /timeline/subscribe request";
+    response->writeHead(QHttpResponse::STATUS_BAD_REQUEST);
+    response->end();
+    return;
+  }
+
+  // check for required arguments
+  QVariantMap query = QueryToMap(request->url());
+
+  if (query.contains("commandID") == false || ((query.contains("port") == false) && !poll))
+  {
+    QLOG_ERROR() << "Missing arguments to /timeline/subscribe request";
+    response->writeHead(QHttpResponse::STATUS_BAD_REQUEST);
+    response->end();
+    return;
+  }
+
+  QString clientIdentifier(request->headers()["x-plex-client-identifier"]);
+
+  QMutexLocker lk(&m_subscriberLock);
+  RemoteSubscriber* subscriber = 0;
+
+  if (m_subscriberMap.contains(clientIdentifier))
+  {
+    QLOG_DEBUG() << "Refreshed subscriber:" << clientIdentifier;
+    subscriber = m_subscriberMap[clientIdentifier];
+    subscriber->reSubscribe();
+  }
+  else
+  {
+    if (poll)
+    {
+      QLOG_DEBUG() << "New poll subscriber:" << clientIdentifier << request->headers()["x-plex-device-name"];
+      subscriber = new RemotePollSubscriber(clientIdentifier, request->headers()["x-plex-device-name"], response, this);
+    }
+    else
+    {
+      QUrl address;
+      QString protocol = query.contains("protocol") ? query["protocol"].toList()[0].toString() : "http";
+      int port = query.contains("port") ? query["port"].toList()[0].toInt() : 32400;
+
+      address.setScheme(protocol);
+      address.setHost(request->remoteAddress());
+      address.setPort(port);
+
+      QLOG_DEBUG() << "New subscriber:" << clientIdentifier << request->headers()["x-plex-device-name"] << address.toString();
+      subscriber = new RemoteSubscriber(clientIdentifier, request->headers()["x-plex-device-name"], address, this);
+    }
+
+    m_subscriberMap[clientIdentifier] = subscriber;
+
+    // if it's our first controller, we notify web for subscription
+    if (m_subscriberMap.size() == 1)
+    {
+      QLOG_DEBUG() << "First subscriber added, subscribing to web";
+      subscribeToWeb(true);
+    }
+  }
+
+  subscriber->setCommandId(m_commandId, query["commandID"].toList()[0].toInt());
+
+  if (!poll)
+  {
+    subscriber->sendUpdate();
+
+    response->writeHead(QHttpResponse::STATUS_OK);
+    response->end();
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::subscribeToWeb(bool subscribe)
+{
+  QVariantMap arg = {
+    { "method", "GET" },
+    { "path",  "/player/timeline/" +  (subscribe ? QLatin1String("subscribe") : QLatin1String("unsubscribe")) },
+    { "commandID", m_commandId}
+  };
+
+  emit commandReceived(arg);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::checkSubscribers()
+{
+  QMutexLocker lk(&m_subscriberLock);
+  QList<RemoteSubscriber*> subsToRemove;
+  foreach(RemoteSubscriber* subscriber, m_subscriberMap.values())
+  {
+    // was it more than 10 seconds since this client checked in last?
+    if (subscriber->lastSubscribe() > 90 * 1000)
+    {
+      QLOG_DEBUG() << "more than 10 seconds since we heard from:" << subscriber->deviceName() << "- unsubscribing..";
+      subsToRemove << subscriber;
+    }
+  }
+
+  lk.unlock();
+
+  foreach(RemoteSubscriber* sub, subsToRemove)
+    subscriberRemove(sub->clientIdentifier());
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QNetworkAccessManager* RemoteComponent::getNetworkAccessManager()
+{
+  // we might want to set common options here.
+  return m_networkAccessManager;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::timelineFinished(QNetworkReply* reply)
+{
+  QString identifier = reply->request().attribute(QNetworkRequest::User).toString();
+
+  // ignore requests with no identifier
+  if (identifier.isEmpty())
+    return;
+
+  QMutexLocker lk(&m_subscriberLock);
+  if (m_subscriberMap.contains(identifier) == false)
+  {
+    QLOG_WARN() << "Got a networkreply with a identifier we don't know about:" << identifier;
+    return;
+  }
+
+  RemoteSubscriber* sub = m_subscriberMap[identifier];
+  lk.unlock();
+
+  sub->timelineFinished(reply);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::subscriberRemove(const QString& identifier)
+{
+  QMutexLocker lk(&m_subscriberLock);
+  if (m_subscriberMap.contains(identifier) == false)
+  {
+    QLOG_ERROR() << "Can't remove client:" << identifier << "since we don't know about it.";
+    return;
+  }
+
+  RemoteSubscriber* subscriber = m_subscriberMap[identifier];
+  m_subscriberMap.remove(identifier);
+  subscriber->deleteLater();
+
+  // if it's our first controller, we notify web for subscription
+  if (m_subscriberMap.size() == 0)
+  {
+    QLOG_DEBUG() << "Last subscriber removed, unsubscribing from web";
+    subscribeToWeb(false);
+  }
+  QLOG_DEBUG() << "Removed subscriber:" << identifier;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteComponent::timelineUpdate(quint64 commandID, const QString& timeline)
+{
+  QMutexLocker lk(&m_subscriberLock);
+
+  foreach (RemoteSubscriber* subscriber, m_subscriberMap.values())
+  {
+    subscriber->queueTimeline(commandID, timeline.toUtf8());
+    subscriber->sendUpdate();
+  }
+}
diff --git a/src/remote/RemoteComponent.h b/src/remote/RemoteComponent.h
new file mode 100644
index 0000000..3a9d3c2
--- /dev/null
+++ b/src/remote/RemoteComponent.h
@@ -0,0 +1,73 @@
+//
+// Created by Tobias Hieta on 24/03/15.
+//
+
+#ifndef _KONVERGO_REMOTECOMPONENT_H_
+#define _KONVERGO_REMOTECOMPONENT_H_
+
+#include <QJsonObject>
+#include <QMutex>
+#include <QTimer>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+
+#include "ComponentManager.h"
+#include "GDMManager.h"
+#include "qhttpresponse.h"
+#include "RemoteSubscriber.h"
+
+class RemoteComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(RemoteComponent);
+
+public:
+  QNetworkAccessManager* getNetworkAccessManager();
+
+  virtual bool componentInitialize();
+  virtual const char* componentName() { return "remote"; }
+  virtual bool componentExport() { return true; }
+
+  static QVariantMap ResourceInformation();
+  static QVariantMap GDMInformation();
+  static QVariantMap HeaderInformation();
+
+  void handleResource(QHttpRequest* request, QHttpResponse* response);
+  void handleCommand(QHttpRequest* request, QHttpResponse* response);
+
+  static QVariantMap HeaderToMap(const HeaderHash& hash);
+  static QVariantMap QueryToMap(const QUrl& url);
+
+  Q_INVOKABLE void commandResponse(const QVariantMap& responseArguments);
+  Q_INVOKABLE QVariantMap resourceInfo() { return ResourceInformation(); }
+  Q_INVOKABLE void timelineUpdate(quint64 commandID, const QString& timeline);
+
+  void subscriberRemove(const QString& identifier);
+
+Q_SIGNALS:
+  void commandReceived(const QVariantMap& commandInfo);
+
+private Q_SLOTS:
+  void checkSubscribers();
+  void timelineFinished(QNetworkReply* reply);
+  void responseDone();
+
+private:
+  RemoteComponent(QObject* parent = 0);
+  void handleSubscription(QHttpRequest * request, QHttpResponse * response, bool poll=false);
+  void subscribeToWeb(bool subscribe);
+
+  GDMManager* m_gdmManager;
+
+  quint64 m_commandId;
+  QMap<quint64, QHttpResponse*> m_responseMap;
+  QMutex m_responseLock;
+
+  QMutex m_subscriberLock;
+  QMap<QString, RemoteSubscriber*> m_subscriberMap;
+  QTimer m_subscriberTimer;
+  QNetworkAccessManager* m_networkAccessManager;
+};
+
+
+#endif //_KONVERGO_REMOTECOMPONENT_H_
diff --git a/src/remote/RemoteSubscriber.cpp b/src/remote/RemoteSubscriber.cpp
new file mode 100644
index 0000000..27ae277
--- /dev/null
+++ b/src/remote/RemoteSubscriber.cpp
@@ -0,0 +1,204 @@
+//
+// Created by Tobias Hieta on 31/03/15.
+//
+
+#include <QNetworkAccessManager>
+#include <QsLog.h>
+#include <QtCore/qxmlstream.h>
+#include <QDomDocument>
+#include <QMutex>
+
+#include "RemoteSubscriber.h"
+#include "RemoteComponent.h"
+#include "settings/SettingsComponent.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+RemoteSubscriber::RemoteSubscriber(const QString& clientIdentifier, const QString& deviceName, const QUrl& address, QObject* parent)
+  : QObject(parent), m_address(address), m_clientIdentifier(clientIdentifier), m_deviceName(deviceName)
+{
+  m_subscribeTime.start();
+
+  if (!address.isEmpty())
+  {
+    RemoteComponent* remote = dynamic_cast<RemoteComponent*>(parent);
+    Q_ASSERT(remote);
+
+    m_netAccess = remote->getNetworkAccessManager();
+
+    // make first access faster by connecting directly to the host now.
+    if (address.scheme() == "https")
+      m_netAccess->connectToHostEncrypted(address.host(), address.port());
+    else
+      m_netAccess->connectToHost(address.host(), address.port());
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteSubscriber::reSubscribe()
+{
+  m_subscribeTime.restart();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString RemoteSubscriber::deviceName()
+{
+  return m_deviceName;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString RemoteSubscriber::clientIdentifier()
+{
+  return m_clientIdentifier;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteSubscriber::sendUpdate()
+{
+  QUrl url(m_address);
+  url.setPath("/:/timeline");
+
+  QNetworkRequest request(url);
+  request.setHeader(QNetworkRequest::ContentTypeHeader, "application/xml");
+  request.setAttribute(QNetworkRequest::User, m_clientIdentifier);
+
+  QVariantMap headers = RemoteComponent::HeaderInformation();
+  foreach (const QString& key, headers.keys())
+  {
+    request.setRawHeader(key.toUtf8(), headers[key].toString().toUtf8());
+  }
+
+  m_netAccess->post(request, getTimeline());
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteSubscriber::timelineFinished(QNetworkReply* reply)
+{
+  if (reply->error() != QNetworkReply::NoError)
+  {
+    QLOG_ERROR() << "got error code when sending timeline:" << reply->errorString();
+#if 0
+    if (++m_errors > 10)
+    {
+      QLOG_ERROR() << "More than 10 errors received. Dropping this subscriber";
+      RemoteComponent::Get()->subscriberRemove(clientIdentifier());
+    }
+#endif
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteSubscriber::queueTimeline(quint64 playerCommandID, const QByteArray& timelineData)
+{
+  QMutexLocker lk(&m_timelineLock);
+
+  QDomDocument doc;
+  if (doc.setContent(timelineData) && doc.firstChildElement("MediaContainer").isNull() == false)
+  {
+    QDomElement node = doc.firstChildElement("MediaContainer");
+    node.setAttribute("commandID", commandId(playerCommandID));
+    m_timeline = doc;
+  }
+  else
+    QLOG_WARN() << "Failed to parse timeline data from player";
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QByteArray RemoteSubscriber::getTimeline()
+{
+  QMutexLocker lk(&m_timelineLock);
+
+  if (m_timeline.isNull())
+  {
+    QByteArray xmlData;
+    QXmlStreamWriter writer(&xmlData);
+
+    writer.writeStartDocument();
+    writer.writeStartElement("MediaContainer");
+    writer.writeAttribute("location", "navigation");
+    writer.writeAttribute("commandID", QString::number(mostRecentCommandId()));
+
+    writer.writeStartElement("Timeline");
+    writer.writeAttribute("type", "music");
+    writer.writeAttribute("state", "stopped");
+    writer.writeEndElement();
+
+    writer.writeStartElement("Timeline");
+    writer.writeAttribute("type", "video");
+    writer.writeAttribute("state", "stopped");
+    writer.writeEndElement();
+
+    writer.writeStartElement("Timeline");
+    writer.writeAttribute("type", "photo");
+    writer.writeAttribute("state", "stopped");
+    writer.writeEndElement();
+
+    writer.writeEndElement();
+    writer.writeEndDocument();
+
+    return xmlData;
+  }
+  else
+  {
+    return m_timeline.toByteArray(2);
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemoteSubscriber::setCommandId(quint64 playerCommandId, quint64 controllerCommandId)
+{
+  QMutexLocker lk(&m_commandIdMapLock);
+
+  m_commandIdMap[playerCommandId] = controllerCommandId;
+
+  // maintain a queue of playerCommandId's so we know in what order to
+  // drop them if we get a lot of them. before we queue the current one
+  // make sure that we remove any old reference to it so it won't get
+  // deleted from the map to early
+  //
+  m_commandIdQueue.removeAll(playerCommandId);
+  m_commandIdQueue.enqueue(playerCommandId);
+
+  if (m_commandIdQueue.size() > 5)
+  {
+    // remove the last one
+    quint64 keyToRemove = m_commandIdQueue.dequeue();
+    m_commandIdMap.remove(keyToRemove);
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+RemotePollSubscriber::RemotePollSubscriber(const QString &clientIdentifier, const QString &deviceName, QHttpResponse *response, QObject *parent) :
+  RemoteSubscriber(clientIdentifier, deviceName, QUrl(""), parent), m_response(response)
+{
+
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemotePollSubscriber::setHTTPResponse(QHttpResponse *response)
+{
+  m_response = response;
+  m_response->setHeader("Content-Type", "application/xml");
+  m_response->setHeader("Access-Control-Expose-Headers", "X-Plex-Client-Identifier");
+
+  connect(m_response, &QHttpResponse::done, this, &RemotePollSubscriber::responseDone);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemotePollSubscriber::sendUpdate()
+{
+  if (m_response)
+  {
+    // if we have a response, we are handling a poll request
+    m_response->writeHead(QHttpResponse::STATUS_OK);
+    m_response->write(getTimeline());
+
+    m_response->end();
+    m_response = NULL;
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void RemotePollSubscriber::responseDone()
+{
+  m_response = NULL;
+}
diff --git a/src/remote/RemoteSubscriber.h b/src/remote/RemoteSubscriber.h
new file mode 100644
index 0000000..2a9b49c
--- /dev/null
+++ b/src/remote/RemoteSubscriber.h
@@ -0,0 +1,87 @@
+//
+// Created by Tobias Hieta on 31/03/15.
+//
+
+#ifndef KONVERGO_REMOTESUBSCRIBER_H
+#define KONVERGO_REMOTESUBSCRIBER_H
+
+#include <QObject>
+#include <QUrl>
+#include <QDateTime>
+#include <QDomDocument>
+#include <QNetworkReply>
+#include <QQueue>
+
+#include "qhttpresponse.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+class RemoteSubscriber : public QObject
+{
+public:
+  RemoteSubscriber(const QString& clientIdentifier, const QString& deviceName, const QUrl& address, QObject* parent = 0);
+  void reSubscribe();
+  int lastSubscribe() const { return m_subscribeTime.elapsed(); }
+
+  QString deviceName();
+  QString clientIdentifier();
+  virtual void sendUpdate();
+  void timelineFinished(QNetworkReply* reply);
+  void queueTimeline(quint64 playerCommandID, const QByteArray& timelineData);
+  QByteArray getTimeline();
+  void setCommandId(quint64 playerCommandId, quint64 controllerCommandId);
+
+  quint64 mostRecentCommandId()
+  {
+    QMutexLocker lk(&m_commandIdMapLock);
+    if (!m_commandIdQueue.isEmpty() && !m_commandIdMap.isEmpty())
+      return m_commandIdMap[m_commandIdQueue.last()];
+    else
+      return 0;
+  }
+
+  quint64 commandId(quint64 playerCommandId)
+  {
+    QMutexLocker lk(&m_commandIdMapLock);
+    if (m_commandIdMap.contains(playerCommandId))
+      return m_commandIdMap[playerCommandId];
+    lk.unlock();
+    return mostRecentCommandId();
+  }
+
+private:
+  QMutex m_commandIdMapLock;
+  QHash<quint64, quint64> m_commandIdMap;
+  QQueue<quint64> m_commandIdQueue;
+
+  QNetworkAccessManager* m_netAccess;
+  QUrl m_address;
+  QTime m_subscribeTime;
+
+  QMutex m_timelineLock;
+  QDomDocument m_timeline;
+
+protected:
+  QString m_clientIdentifier;
+  QString m_deviceName;
+
+#if 0
+  quint16 m_errors;
+ #endif
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////
+class RemotePollSubscriber : public RemoteSubscriber
+{
+public:
+  RemotePollSubscriber(const QString& clientIdentifier, const QString& deviceName, QHttpResponse *response, QObject* parent = 0);
+  void setHTTPResponse(QHttpResponse *response);
+  virtual void sendUpdate();
+
+private :
+   QHttpResponse* m_response;
+
+public Q_SLOTS:
+   void responseDone();
+};
+
+#endif //KONVERGO_REMOTESUBSCRIBER_H
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
new file mode 100644
index 0000000..493d7a9
--- /dev/null
+++ b/src/server/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_sources(
+  HTTPServer.cpp HTTPServer.h
+)
\ No newline at end of file
diff --git a/src/server/HTTPServer.cpp b/src/server/HTTPServer.cpp
new file mode 100644
index 0000000..d822789
--- /dev/null
+++ b/src/server/HTTPServer.cpp
@@ -0,0 +1,170 @@
+#include "HTTPServer.h"
+
+#include <QFile>
+#include <QCoreApplication>
+
+#include "QsLog.h"
+#include "utils/Utils.h"
+#include "settings/SettingsComponent.h"
+#include "remote/RemoteComponent.h"
+#include "Paths.h"
+
+#define WEB_CLIENT_PATH "/web/tv"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+HttpServer::HttpServer(QObject* parent) : QObject(parent)
+{
+  m_server = new QHttpServer(this);
+  m_baseUrl = ":/konvergo";
+  m_port = (quint16)SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "webserverport").toUInt();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HttpServer::start()
+{
+  connect(m_server, &QHttpServer::newRequest, this, &HttpServer::handleRequest);
+  if (!m_server->listen(QHostAddress::AnyIPv4, m_port))
+    throw FatalException(tr("Could not start local web server:") + "<br>" + m_server->errorString());
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HttpServer::writeError(QHttpResponse* response, QHttpResponse::StatusCode errorCode)
+{
+  QByteArray errorStyle = "<style>h1 {color:red;}</style>";
+  response->writeHead(errorCode);
+  response->write(errorStyle);
+
+  QByteArray error;
+  switch (errorCode)
+  {
+    case QHttpResponse::STATUS_FORBIDDEN:
+      error = "Access to file denied. You might want to check permissions";
+      break;
+    case QHttpResponse::STATUS_NOT_FOUND:
+      error = "Could not find that file. Install might be broken?";
+      break;
+    case QHttpResponse::STATUS_METHOD_NOT_ALLOWED:
+      error = "That method is not allowed.";
+      break;
+    case QHttpResponse::STATUS_NOT_IMPLEMENTED:
+      error = "This request is not yet implemented";
+      break;
+    default:
+      error = "Generic error, something went wrong<tm>";
+      break;
+  }
+  response->write("<h1>");
+  response->write(error);
+  response->write("</h1>");
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool HttpServer::writeFile(const QString& file, QHttpResponse* response)
+{
+  QLOG_DEBUG() << "Going to request file:" << qPrintable(file);
+  if (QFile::exists(file))
+  {
+    QFile fp(file);
+    if (fp.open(QFile::ReadOnly))
+    {
+      response->writeHead(QHttpResponse::STATUS_OK);
+      response->write(fp.readAll());
+      fp.close();
+      return true;
+    }
+    else
+    {
+      writeError(response, QHttpResponse::STATUS_FORBIDDEN);
+      return false;
+    }
+  }
+  else
+  {
+    writeError(response, QHttpResponse::STATUS_NOT_FOUND);
+    return false;
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HttpServer::handleWebClientRequest(QHttpRequest* request, QHttpResponse* response)
+{
+  switch (request->method())
+  {
+    case QHttpRequest::HTTP_GET:
+    {
+      // cut the WEB_CLIENT_PATH prefix
+      QString relativeUrl = request->path();
+      relativeUrl.replace(WEB_CLIENT_PATH, "");
+      QString rUrl = m_baseUrl + relativeUrl;
+
+      writeFile(rUrl, response);
+      break;
+    }
+
+    default:
+    {
+      writeError(response, QHttpResponse::STATUS_METHOD_NOT_ALLOWED);
+      QLOG_WARN() << "Method" << qPrintable(request->methodString()) << "is not supported";
+    }
+  }
+
+  response->end();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HttpServer::handleResource(QHttpRequest* request, QHttpResponse* response)
+{
+  RemoteComponent::Get().handleResource(request, response);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HttpServer::handleRemoteController(QHttpRequest* request, QHttpResponse* response)
+{
+  RemoteComponent::Get().handleCommand(request, response);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HttpServer::handleFilesRequest(QHttpRequest* request, QHttpResponse* response)
+{
+  if (request->path() == "/files/qwebchannel.js")
+    writeFile(":/qtwebchannel/qwebchannel.js", response);
+  else
+    writeError(response, QHttpResponse::STATUS_NOT_FOUND);
+
+  response->end();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HttpServer::handleRequest(QHttpRequest* request, QHttpResponse* response)
+{
+  QLOG_DEBUG() << "Incoming request to:" << request->url().toString() << "from" << request->remoteAddress();
+
+  QString path = request->path();
+  if (path.startsWith(WEB_CLIENT_PATH))
+  {
+    handleWebClientRequest(request, response);
+  }
+  else if (path.startsWith("/resources"))
+  {
+    handleResource(request, response);
+  }
+  else if (path.startsWith("/player"))
+  {
+    handleRemoteController(request, response);
+  }
+  else if (path.startsWith("/files"))
+  {
+    handleFilesRequest(request, response);
+  }
+  else if (path == "/")
+  {
+    response->writeHead(QHttpResponse::STATUS_OK);
+    response->end("You should not be here :-)");
+  }
+  else
+  {
+    writeError(response, QHttpResponse::STATUS_NOT_FOUND);
+    response->end();
+  }
+}
+
diff --git a/src/server/HTTPServer.h b/src/server/HTTPServer.h
new file mode 100644
index 0000000..e42f12d
--- /dev/null
+++ b/src/server/HTTPServer.h
@@ -0,0 +1,34 @@
+#ifndef HTTPSERVER_H
+#define HTTPSERVER_H
+
+#include <QObject>
+#include <QString>
+#include <qhttprequest.h>
+#include <qhttpresponse.h>
+
+#include "qhttpserver.h"
+
+class HttpServer : public QObject
+{
+  Q_OBJECT
+public:
+  HttpServer(QObject* parent);
+  void start();
+
+private slots:
+  void handleRequest(QHttpRequest *request, QHttpResponse *response);
+  void handleWebClientRequest(QHttpRequest * request, QHttpResponse * response);
+  void handleResource(QHttpRequest* request, QHttpResponse* response);
+  void handleRemoteController(QHttpRequest* request, QHttpResponse* response);
+  void handleFilesRequest(QHttpRequest* request, QHttpResponse* response);
+  void writeError(QHttpResponse* response, QHttpResponse::StatusCode errorCode);
+
+private:
+  bool writeFile(const QString& file, QHttpResponse* response);
+
+  QHttpServer* m_server;
+  QString m_baseUrl;
+  quint16 m_port;
+};
+
+#endif // HTTPSERVER_H
diff --git a/src/settings/AudioSettingsController.cpp b/src/settings/AudioSettingsController.cpp
new file mode 100644
index 0000000..a38284a
--- /dev/null
+++ b/src/settings/AudioSettingsController.cpp
@@ -0,0 +1,61 @@
+//
+// Created by Tobias Hieta on 21/08/15.
+//
+
+#include "AudioSettingsController.h"
+#include "SettingsComponent.h"
+#include "SettingsSection.h"
+#include "PlayerComponent.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+AudioSettingsController::AudioSettingsController(QObject* parent) : QObject(parent)
+{
+  SettingsSection* audioSection = SettingsComponent::Get().getSection(SETTINGS_SECTION_AUDIO);
+  connect(audioSection, &SettingsSection::valuesUpdated, this, &AudioSettingsController::valuesUpdated);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void AudioSettingsController::setHiddenPassthrough(const QStringList& codecs, bool hidden)
+{
+  SettingsSection* audioSection = SettingsComponent::Get().getSection(SETTINGS_SECTION_AUDIO);
+  foreach(const QString& codec, codecs)
+    audioSection->setValueHidden("passthrough." + codec, hidden);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void AudioSettingsController::valuesUpdated(const QVariantMap& values)
+{
+  bool advanced = SettingsComponent::Get().value(SETTINGS_SECTION_AUDIO, "advanced").toBool();
+  SettingsSection* audioSection = SettingsComponent::Get().getSection(SETTINGS_SECTION_AUDIO);
+
+  if (values.contains("devicetype"))
+  {
+    QString type = values.value("devicetype").toString();
+    if (type == AUDIO_DEVICE_TYPE_BASIC)
+    {
+      setHiddenPassthrough(PlayerComponent::AudioCodecsAll(), true);
+    }
+    else if (type == AUDIO_DEVICE_TYPE_HDMI)
+    {
+      setHiddenPassthrough(PlayerComponent::AudioCodecsAll(), !advanced);
+    }
+    else if (type == AUDIO_DEVICE_TYPE_SPDIF)
+    {
+      setHiddenPassthrough(PlayerComponent::AudioCodecsAll(), true);
+      setHiddenPassthrough(PlayerComponent::AudioCodecsSPDIF(), false);
+    }
+
+    emit settingsUpdated(SETTINGS_SECTION_AUDIO, audioSection->descriptions());
+  }
+
+  if (values.contains("advanced"))
+  {
+    advanced = values.value("advanced").toBool();
+    if (audioSection->value("devicetype") == AUDIO_DEVICE_TYPE_HDMI)
+      setHiddenPassthrough(PlayerComponent::AudioCodecsAll(), !advanced);
+
+    audioSection->setValueHidden("exclusive", !advanced);
+
+    emit settingsUpdated(SETTINGS_SECTION_AUDIO, audioSection->descriptions());
+  }
+}
diff --git a/src/settings/AudioSettingsController.h b/src/settings/AudioSettingsController.h
new file mode 100644
index 0000000..5f33846
--- /dev/null
+++ b/src/settings/AudioSettingsController.h
@@ -0,0 +1,22 @@
+//
+// Created by Tobias Hieta on 21/08/15.
+//
+
+#ifndef KONVERGO_AUDIOSETTINGSCONTROLLER_H
+#define KONVERGO_AUDIOSETTINGSCONTROLLER_H
+
+#include <QObject>
+
+class AudioSettingsController : public QObject
+{
+  Q_OBJECT
+public:
+  AudioSettingsController(QObject* parent = 0);
+  Q_SLOT void valuesUpdated(const QVariantMap& values);
+  Q_SIGNAL void settingsUpdated(const QString& section, const QVariant& description);
+
+private:
+  void setHiddenPassthrough(const QStringList& codecs, bool hidden);
+};
+
+#endif //KONVERGO_AUDIOSETTINGSCONTROLLER_H
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
new file mode 100644
index 0000000..6cdb928
--- /dev/null
+++ b/src/settings/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_sources(
+  AudioSettingsController.cpp AudioSettingsController.h
+  SettingsComponent.cpp SettingsComponent.h
+  SettingsSection.cpp SettingsSection.h
+  SettingsValue.h
+)
\ No newline at end of file
diff --git a/src/settings/SettingsComponent.cpp b/src/settings/SettingsComponent.cpp
new file mode 100644
index 0000000..3891111
--- /dev/null
+++ b/src/settings/SettingsComponent.cpp
@@ -0,0 +1,505 @@
+#include "SettingsComponent.h"
+#include "SettingsSection.h"
+#include "Paths.h"
+#include "utils/Utils.h"
+#include "QsLog.h"
+#include "AudioSettingsController.h"
+#include "Names.h"
+
+#include <QSaveFile>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonArray>
+#include <QList>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+SettingsComponent::SettingsComponent(QObject *parent) : ComponentBase(parent), m_settingsVersion(-1)
+{
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::updatePossibleValues(const QString &sectionID, const QString &key, const QVariantList &possibleValues)
+{
+  SettingsSection* section = getSection(sectionID);
+  if (!section)
+  {
+    QLOG_ERROR() << "Section" << sectionID << "is unknown";
+    return;
+  }
+  section->updatePossibleValues(key, possibleValues);
+  QLOG_DEBUG() << "Updated possible values for:" << key << "to" << possibleValues;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QVariant SettingsComponent::allValues(const QString& section)
+{
+  if (section.isEmpty())
+  {
+    QVariantMap all;
+    foreach (const QString& sname, m_sections.keys())
+      all[sname] = m_sections[sname]->allValues();
+    return all;
+  }
+  else if (m_sections.contains(section))
+  {
+    return m_sections[section]->allValues();
+  }
+  else
+  {
+    // look for the value in the webclient section
+    return m_sections[SETTINGS_SECTION_WEBCLIENT]->value(section);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static QByteArray loadFile(const QString& filename)
+{
+  QLOG_DEBUG() << "Opening:" << filename;
+
+  QFile file(filename);
+  // Checking existence before opening is technically a race condition, but
+  // it looks like Qt doesn't let us distinguish errors on opening.
+  if (!file.exists())
+    return "";
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+  {
+    QLOG_ERROR() << "Could not open" << filename;
+    return "";
+  }
+  return file.readAll();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static void writeFile(const QString& filename, const QByteArray& data)
+{
+  QLOG_DEBUG() << "Writing:" << filename;
+
+  QSaveFile file(filename);
+  file.open(QIODevice::WriteOnly | QIODevice::Text);
+  file.write(data);
+  if (!file.commit())
+  {
+    QLOG_ERROR() << "Could not write" << filename;
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static QJsonObject loadJson(const QString& filename)
+{
+  QJsonDocument json = QJsonDocument::fromJson(loadFile(filename));
+  return json.object();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+static void writeJson(const QString& filename, const QJsonObject& data, bool pretty = true)
+{
+  QJsonDocument json(data);
+  writeFile(filename, json.toJson(pretty ? QJsonDocument::Indented : QJsonDocument::Compact));
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::load()
+{
+  loadConf(Paths::dataDir("plexmediaplayer.conf"), false);
+  loadConf(Paths::dataDir("storage.json"), true);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::loadConf(const QString& path, bool storage)
+{
+  QJsonObject json = loadJson(path);
+
+  int version = json["version"].toInt(0);
+  if (version != m_settingsVersion)
+  {
+    QString backup = path + ".broken";
+    QFile::remove(backup);
+    QFile::rename(path, backup);
+    if (version == 0)
+      QLOG_ERROR() << "Could not read config file.";
+    else
+      QLOG_ERROR() << "Config version is" << version << "but" << m_settingsVersion << "expected. Moving old config to" << backup;
+    return;
+  }
+
+  QJsonObject jsonSections = json["sections"].toObject();
+
+  foreach (const QString& section, jsonSections.keys())
+  {
+    QJsonObject jsonSection = jsonSections[section].toObject();
+
+    SettingsSection* sec = getSection(section);
+    if (!sec && storage)
+    {
+      sec = new SettingsSection(section, PLATFORM_ANY, -1, this);
+      sec->setHidden(true);
+      sec->setStorage(true);
+      m_sections.insert(section, sec);
+    }
+    else if (!sec)
+    {
+      QLOG_ERROR() << "Trying to load section:" << section << "from config file, but we don't want that.";
+      continue;
+    }
+
+    foreach (const QString& setting, jsonSection.keys())
+      sec->setValue(setting, jsonSection.value(setting).toVariant());
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::save(bool justStorage)
+{
+  QVariantMap sections;
+  QVariantMap storage;
+
+  foreach(SettingsSection* section, m_sections.values())
+  {
+    if (section->isStorage())
+      storage.insert(section->sectionName(), section->allValues());
+    else
+      sections.insert(section->sectionName(), section->allValues());
+  }
+
+  if (!justStorage)
+  {
+    QJsonObject json;
+    json.insert("sections", QJsonValue::fromVariant(sections));
+    json.insert("version", m_settingsVersion);
+    writeJson(Paths::dataDir("plexmediaplayer.conf"), json);
+  }
+
+  QJsonObject storagejson;
+  storagejson.insert("sections", QJsonValue::fromVariant(storage));
+  storagejson.insert("version", m_settingsVersion);
+  writeJson(Paths::dataDir("storage.json"), storagejson, false);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QVariant SettingsComponent::value(const QString& sectionID, const QString &key)
+{
+  SettingsSection* section = getSection(sectionID);
+  if (!section)
+  {
+    QLOG_ERROR() << "Section" << sectionID << "is unknown";
+    return QVariant();
+  }
+  return section->value(key);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::setValue(const QString& sectionID, const QString &key, const QVariant &value)
+{
+  SettingsSection* section = getSection(sectionID);
+  if (!section)
+  {
+    QLOG_ERROR() << "Section" << sectionID << "is unknown";
+    return;
+  }
+  section->setValue(key, value);
+  save(false);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::setValues(const QVariantMap& options)
+{
+  Q_ASSERT(options.contains("key"));
+  Q_ASSERT(options.contains("value"));
+
+  QString key = options["key"].toString();
+  QVariant values = options["value"];
+
+  bool updatedStorageOnly = true;
+
+  if (values.type() == QVariant::Map || values.isNull())
+  {
+    SettingsSection* section = getSection(key);
+    if (!section)
+    {
+      // let's create this section since it's most likely created by the webclient
+      section = new SettingsSection(key, PLATFORM_ANY, -1, this);
+      section->setHidden(true);
+      section->setStorage(true);
+      m_sections.insert(key, section);
+    }
+
+    if (values.isNull())
+      section->removeValues();
+    else
+      section->setValues(values);
+
+    updatedStorageOnly = section->isStorage();
+  }
+  else if (values.type() == QVariant::String)
+  {
+    setValue(SETTINGS_SECTION_WEBCLIENT, key, values);
+  }
+  else
+  {
+    QLOG_WARN() << "the values sent was not a map, string or empty value. it will be ignored";
+
+    // return so we don't call save()
+    return;
+  }
+
+  save(updatedStorageOnly);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::removeValue(const QString &sectionOrKey)
+{
+  SettingsSection* section = getSection(sectionOrKey);
+
+  if (section)
+  {
+    // we want to remove a full section
+    // dont remove the section, but remove all keys
+    section->removeValues();
+    save(false);
+  }
+  else
+  {
+    // we want to remove a root key from webclient
+    // which is stored in webclient section
+    section = m_sections[SETTINGS_SECTION_WEBCLIENT];
+    section->removeValue(sectionOrKey);
+    save(false);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::resetToDefault()
+{
+  foreach(SettingsSection *section, m_sections)
+  {
+   section->resetToDefault();
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+struct section_order_index
+{
+  inline bool operator ()(SettingsSection* a, SettingsSection* b)
+  {
+    return a->orderIndex() < b->orderIndex();
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QVariantList SettingsComponent::settingDescriptions()
+{
+  QJsonArray desc;
+
+  QList<SettingsSection*> sectionList = m_sections.values();
+  std::sort(sectionList.begin(), sectionList.end(), section_order_index());
+
+  foreach(SettingsSection* section, sectionList)
+  {
+    if (!section->isHidden())
+      desc.push_back(QJsonValue::fromVariant(section->descriptions()));
+  }
+
+  QJsonDocument doc = QJsonDocument(desc);
+  QLOG_DEBUG() << "Settings description:\n" << qPrintable(doc.toJson());
+
+  return desc.toVariantList();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool SettingsComponent::loadDescription()
+{
+  QJsonParseError err;
+  auto doc = Utils::OpenJsonDocument(":/settings/settings_description.json", &err);
+  if (doc.isNull())
+  {
+    QLOG_ERROR() << "Failed to read settings description:" << err.errorString();
+    throw FatalException("Failed to read settings description!");
+  }
+
+  if (!doc.isArray())
+  {
+    QLOG_ERROR() << "The object needs to be an array";
+    return false;
+  }
+
+  m_sectionIndex = 0;
+
+  foreach(const QJsonValue& val, doc.array())
+  {
+    if (!val.isObject())
+    {
+      QLOG_ERROR() << "Hoped to find sections in the root array, but they where not JSON objects";
+      return false;
+    }
+
+    QJsonObject section = val.toObject();
+    if (!section.contains("section"))
+    {
+      QLOG_ERROR() << "A section needs to contain the section keyword.";
+      return false;
+    }
+
+    if (section["section"] == "__meta__")
+      m_settingsVersion = section.value("version").toInt();
+    else
+      parseSection(section);
+  }
+
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void SettingsComponent::parseSection(const QJsonObject& sectionObject)
+{
+  QString sectionName = sectionObject.value("section").toString();
+  if (!sectionObject.contains("values") || !sectionObject.value("values").isArray())
+  {
+    QLOG_ERROR() << "section object:" << sectionName << "did not contain a values array";
+    return;
+  }
+
+  int platformMask = platformMaskFromObject(sectionObject);
+
+  SettingsSection* section = new SettingsSection(sectionName, (quint8)platformMask, m_sectionIndex ++, this);
+  section->setHidden(sectionObject.value("hidden").toBool(false));
+  section->setStorage(sectionObject.value("storage").toBool(false));
+
+  auto values = sectionObject.value("values").toArray();
+  int order = 0;
+  foreach(auto val, values)
+  {
+    if (!val.isObject())
+      continue;
+
+    QJsonObject valobj = val.toObject();
+    if (!valobj.contains("value") || !valobj.contains("default") || valobj.value("value").isNull())
+      continue;
+
+    int vPlatformMask = platformMaskFromObject(valobj);
+    SettingsValue* setting = new SettingsValue(valobj.value("value").toString(), valobj.value("default").toVariant(), (quint8)vPlatformMask, this);
+    setting->setHidden(valobj.value("hidden").toBool(false));
+    setting->setIndexOrder(order ++);
+
+    if (valobj.contains("possible_values") && valobj.value("possible_values").isArray())
+    {
+      auto list = valobj.value("possible_values").toArray();
+      foreach(const auto& v, list)
+      {
+        int platform = PLATFORM_ANY;
+
+        auto vl = v.toArray();
+        if (vl.size() < 2)
+          continue;
+
+        if (vl.size() == 3 && vl.at(2).isObject())
+        {
+          // platform options
+          QJsonObject options = vl.at(2).toObject();
+          platform = platformMaskFromObject(options);
+        }
+
+        if ((platform & Utils::CurrentPlatform()) == Utils::CurrentPlatform())
+          setting->addPossibleValue(vl.at(1).toString(), vl.at(0).toVariant());
+      }
+    }
+
+    section->registerSetting(setting);
+  }
+
+  m_sections.insert(sectionName, section);
+  QLOG_DEBUG() << "Added section:" << sectionName;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+int SettingsComponent::platformMaskFromObject(const QJsonObject& object)
+{
+  int platformMask = PLATFORM_ANY;
+
+  // only include the listed platforms
+  if (object.contains("platforms"))
+  {
+    // start by resetting it to no platforms
+    platformMask = PLATFORM_UNKNOWN;
+
+    QJsonValue platforms = object.value("platforms");
+
+    // platforms can be both array or a single string
+    if (platforms.isArray())
+    {
+      foreach(const QJsonValue& pl, platforms.toArray())
+      {
+        if (!pl.isString())
+          continue;
+
+        platformMask |= platformFromString(pl.toString());
+      }
+    }
+    else
+    {
+      platformMask = platformFromString(platforms.toString());
+    }
+  }
+  else if (object.contains("platforms_excluded"))
+  {
+    QJsonValue val = object.value("platforms_excluded");
+    if (val.isArray())
+    {
+      foreach(const QJsonValue& pl, val.toArray())
+      {
+        if (!pl.isString())
+          continue;
+
+        platformMask &= ~platformFromString(pl.toString());
+      }
+    }
+    else
+    {
+      platformMask &= ~platformFromString(val.toString());
+    }
+  }
+
+  return platformMask;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+Platform SettingsComponent::platformFromString(const QString& platformString)
+{
+  if (platformString == "osx")
+    return PLATFORM_OSX;
+  else if (platformString == "windows")
+    return PLATFORM_WINDOWS;
+  else if (platformString == "linux")
+    return PLATFORM_LINUX;
+  else if (platformString == "oe")
+    return PLATFORM_OE;
+  else if (platformString == "oe_rpi")
+    return PLATFORM_OE_RPI;
+  else if (platformString == "oe_x86")
+    return PLATFORM_OE_X86;
+  else if (platformString == "any")
+    return PLATFORM_ANY;
+
+  return PLATFORM_UNKNOWN;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool SettingsComponent::componentInitialize()
+{
+  if (!loadDescription())
+    return false;
+
+  load();
+
+  // add our AudioSettingsController that will inspect audio settings and react.
+  // then run the signal the first time to make sure that we set the proper visibility
+  // on the items from the start.
+  //
+  AudioSettingsController* ctrl = new AudioSettingsController(this);
+  QVariantMap val;
+  val.insert("devicetype", value(SETTINGS_SECTION_AUDIO, "devicetype"));
+  val.insert("advanced", value(SETTINGS_SECTION_AUDIO, "advanced"));
+  ctrl->valuesUpdated(val);
+  connect(ctrl, &AudioSettingsController::settingsUpdated, this, &SettingsComponent::groupUpdate);
+
+  return true;
+}
\ No newline at end of file
diff --git a/src/settings/SettingsComponent.h b/src/settings/SettingsComponent.h
new file mode 100644
index 0000000..ebdfe4d
--- /dev/null
+++ b/src/settings/SettingsComponent.h
@@ -0,0 +1,78 @@
+#ifndef SETTINGSCOMPONENT_H
+#define SETTINGSCOMPONENT_H
+
+#include <QObject>
+#include "utils/Utils.h"
+#include "ComponentManager.h"
+#include "SettingsValue.h"
+
+#define SETTINGS_SECTION_AUDIO "audio"
+#define SETTINGS_SECTION_VIDEO "video"
+#define SETTINGS_SECTION_MAIN "main"
+#define SETTINGS_SECTION_STATE "state"
+#define SETTINGS_SECTION_PATH "path"
+#define SETTINGS_SECTION_WEBCLIENT "webclient"
+#define SETTINGS_SECTION_SUBTITLES "subtitles"
+#define SETTINGS_SECTION_OVERRIDES "overrides"
+#define SETTINGS_SECTION_CEC "cec"
+#define SETTINGS_SECTION_OPENELEC "openelec"
+
+#define AUDIO_DEVICE_TYPE_BASIC "basic"
+#define AUDIO_DEVICE_TYPE_SPDIF "spdif"
+#define AUDIO_DEVICE_TYPE_HDMI "hdmi"
+
+
+class SettingsSection;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class SettingsComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(SettingsComponent);
+
+public:
+  bool componentInitialize();
+
+  const char* componentName() { return "settings"; }
+  bool componentExport() { return true; }
+
+  SettingsSection* getSection(const QString& sectionID)
+  {
+    if (m_sections.contains(sectionID))
+      return m_sections.value(sectionID);
+    else
+      return nullptr;
+  }
+
+  // JS interface
+  Q_INVOKABLE void setValue(const QString& sectionID, const QString& key, const QVariant& value);
+  Q_INVOKABLE void setValues(const QVariantMap& options);
+  Q_INVOKABLE QVariant value(const QString& sectionID, const QString& key);
+  Q_INVOKABLE QVariant allValues(const QString& section = "");
+  Q_INVOKABLE void removeValue(const QString& sectionOrKey);
+  Q_INVOKABLE void resetToDefault();
+  Q_INVOKABLE QVariantList settingDescriptions();
+
+  void updatePossibleValues(const QString& sectionID, const QString& key, const QVariantList& possibleValues);
+
+  void save(bool justStorage);
+  void load();
+
+  Q_SIGNAL void groupUpdate(const QString& section, const QVariant& description);
+
+private:
+  explicit SettingsComponent(QObject *parent = 0);
+  bool loadDescription();
+  void parseSection(const QJsonObject& sectionObject);
+  int platformMaskFromObject(const QJsonObject& object);
+  Platform platformFromString(const QString& platformString);
+
+  QMap<QString, SettingsSection*> m_sections;
+
+  int m_settingsVersion;
+  int m_sectionIndex;
+
+  void loadConf(const QString& path, bool storage);
+};
+
+#endif // SETTINGSCOMPONENT_H
diff --git a/src/settings/SettingsSection.cpp b/src/settings/SettingsSection.cpp
new file mode 100644
index 0000000..1bd2e90
--- /dev/null
+++ b/src/settings/SettingsSection.cpp
@@ -0,0 +1,165 @@
+#include "SettingsSection.h"
+#include "QsLog.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+SettingsSection::SettingsSection(const QString& sectionID, quint8 platforms, int _orderIndex, QObject* parent)
+  : QObject(parent), m_sectionID(sectionID), m_orderIndex(_orderIndex), m_platform(platforms), m_hidden(false), m_storage(false)
+{
+  m_values.clear();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void SettingsSection::registerSetting(SettingsValue* value)
+{
+  if (m_values.contains(value->key()))
+  {
+    QLOG_WARN() << QString("Trying to register %1.%2 multiple times").arg(m_sectionID).arg(value->key());
+    return;
+  }
+
+  value->setParent(this);
+  m_values[value->key()] = value;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsSection::setValues(const QVariant& values)
+{
+  QVariantMap map = values.toMap();
+  QVariantMap updatedValues;
+
+  // values not included in the map are reset to default
+  foreach (const QString& key, m_values.keys())
+  {
+    if (!map.contains(key))
+      map[key] = m_values[key]->defaultValue();
+  }
+
+  foreach (const QString& key, map.keys())
+  {
+    if (key.isEmpty())
+      continue;
+
+    bool haveKey = m_values.contains(key);
+    if (haveKey && m_values[key]->value() == map[key])
+      continue;
+
+    if (haveKey)
+    {
+      m_values[key]->setValue(map[key]);
+    }
+    else
+    {
+      m_values[key] = new SettingsValue(key, QVariant(), PLATFORM_ANY, this);
+      m_values[key]->setValue(map[key]);
+    }
+
+    updatedValues.insert(key, map[key]);
+  }
+
+  if (updatedValues.size() > 0)
+    emit valuesUpdated(updatedValues);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QVariant SettingsSection::value(const QString& key)
+{
+  if (m_values.contains(key))
+    return m_values[key]->value();
+
+  QLOG_WARN() << "Looking for value:" << key << "in section:" << m_sectionID << "but it can't be found";
+  return QVariant();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsSection::updatePossibleValues(const QString &key, const QVariantList &possibleValues)
+{
+  if (m_values.contains(key))
+    m_values[key]->setPossibleValues(possibleValues);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool SettingsSection::setValue(const QString& key, const QVariant& value)
+{
+  if (key == "index")
+    return false;
+
+  QVariantMap values;
+  // populate with default values (setValues() resets missing values)
+  foreach (const QString& entry, m_values.keys())
+    values[entry] = m_values[entry]->value();
+
+  values[key] = value;
+
+  setValues(values);
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsSection::removeValue(const QString &key)
+{
+  if (m_values.contains(key))
+  {
+    m_values[key]->deleteLater();
+    m_values.remove(key);
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsSection::removeValues()
+{
+  m_values.clear();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+const QVariantMap SettingsSection::allValues() const
+{
+  QVariantMap values;
+
+  foreach (SettingsValue* val, m_values.values())
+    values[val->key()] = val->value();
+
+  return values;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+struct value_sort_order
+{
+  inline bool operator()(SettingsValue* a, SettingsValue* b)
+  {
+    return a->indexOrder() < b->indexOrder();
+  }
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+const QVariantMap SettingsSection::descriptions() const
+{
+  QVariantMap map;
+
+  map.insert("key", m_sectionID);
+
+  QList<SettingsValue*> list = m_values.values();
+  std::sort(list.begin(), list.end(), value_sort_order());
+
+  QVariantList settings;
+  foreach(SettingsValue* value, list)
+  {
+    if (!value->isHidden())
+      settings.push_back(value->descriptions());
+  }
+  map.insert("settings", settings);
+  return map;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SettingsSection::resetToDefault()
+{
+  foreach (const QString& key, m_values.keys())
+    m_values[key]->reset();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool SettingsSection::isHidden() const
+{
+  bool correctPlatform = ((m_platform & Utils::CurrentPlatform()) == Utils::CurrentPlatform());
+  return (m_hidden || !correctPlatform);
+}
\ No newline at end of file
diff --git a/src/settings/SettingsSection.h b/src/settings/SettingsSection.h
new file mode 100644
index 0000000..fe3d941
--- /dev/null
+++ b/src/settings/SettingsSection.h
@@ -0,0 +1,65 @@
+#ifndef SETTINGSSECTION_H
+#define SETTINGSSECTION_H
+
+#include <QObject>
+#include <QMap>
+#include <QVariant>
+#include "SettingsValue.h"
+#include "SettingsComponent.h"
+#include "QsLog.h"
+
+class SettingsSection : public QObject
+{
+  Q_OBJECT
+public:
+  explicit SettingsSection(const QString& sectionID, quint8 platforms = PLATFORM_ANY,
+                           int _orderIndex = -1, QObject* parent = 0);
+
+  void updatePossibleValues(const QString& key, const QVariantList& possibleValues);
+
+  void setValues(const QVariant& values);
+  bool setValue(const QString& key, const QVariant& value);
+  void removeValue(const QString& key);
+  void removeValues();
+  void resetToDefault();
+  void registerSetting(SettingsValue* value);
+  bool isHidden() const;
+
+  QVariant value(const QString& key);
+  QString sectionName() const { return m_sectionID; }
+
+  const QVariantMap allValues() const;
+  const QVariantMap descriptions() const;
+
+  bool isValueHidden(const QString& key) const { return m_values[key]->isHidden(); }
+  int orderIndex() const { return m_orderIndex; }
+
+  void setHidden(bool hidden=true)
+  {
+    m_hidden = hidden;
+  }
+
+  void setValueHidden(const QString& value, bool hidden)
+  {
+    if (m_values.contains(value))
+      m_values.value(value)->setHidden(hidden);
+  }
+
+  void setStorage(bool storage) { m_storage = storage; }
+  bool isStorage() const
+  {
+    return m_storage;
+  }
+
+  Q_SIGNAL void valuesUpdated(const QVariantMap& values);
+
+protected:
+  QHash<QString, SettingsValue*> m_values;
+  QString m_sectionID;
+  int m_orderIndex;
+  quint8 m_platform;
+  bool m_hidden;
+  bool m_storage;
+};
+
+#endif // SETTINGSSECTION_H
diff --git a/src/settings/SettingsValue.h b/src/settings/SettingsValue.h
new file mode 100644
index 0000000..cc1a050
--- /dev/null
+++ b/src/settings/SettingsValue.h
@@ -0,0 +1,137 @@
+//
+// Created by Tobias Hieta on 12/08/15.
+//
+
+#ifndef KONVERGO_SETTINGS_VALUE_H
+#define KONVERGO_SETTINGS_VALUE_H
+
+#include <QVariant>
+#include <utils/Utils.h>
+
+class SettingsValue : public QObject
+{
+  Q_OBJECT
+
+public:
+  SettingsValue(QObject* parent = 0)
+    : QObject(parent)
+    , m_platform(PLATFORM_UNKNOWN)
+    , m_hidden(true)
+  {}
+
+  SettingsValue(const QString& _key, QVariant _defaultValue=QVariant(), quint8 platforms = PLATFORM_ANY, QObject* parent = 0)
+    : QObject(parent)
+    , m_key(_key)
+    , m_value(QVariant())
+    , m_defaultValue(_defaultValue)
+    , m_platform(platforms)
+    , m_hidden(true)
+  {}
+
+  const QString& key() const { return m_key; }
+
+  const QVariant& value() const
+  {
+    if (!m_value.isValid())
+      return m_defaultValue;
+    return m_value;
+  }
+
+  void setValue(const QVariant& value)
+  {
+    m_value = value;
+  }
+
+  const QVariant& defaultValue() const
+  {
+    return m_defaultValue;
+  }
+
+  void setDefaultValue(const QVariant& defaultValue)
+  {
+    m_defaultValue = defaultValue;
+  }
+
+  const QVariantList& possibleValues() const
+  {
+    return m_possibleValues;
+  }
+
+  void setPossibleValues(const QVariantList& possibleValues)
+  {
+    m_possibleValues = possibleValues;
+  }
+
+  const quint8 platform() const
+  {
+    return m_platform;
+  }
+
+  void setPlatform(quint8 platform)
+  {
+    m_platform = platform;
+  }
+
+  void setHidden(bool hidden)
+  {
+    m_hidden = hidden;
+  }
+
+  bool isHidden() const
+  {
+    bool correctPlatform = ((m_platform & Utils::CurrentPlatform()) == Utils::CurrentPlatform());
+    return (m_hidden || !correctPlatform);
+  }
+
+  void addPossibleValue(const QString& key, const QVariant& value)
+  {
+    QVariantMap entry;
+    entry["value"] = value;
+    entry["title"] = key;
+    m_possibleValues << entry;
+  }
+
+  void addNumericRange(double min, double max, double step = 1.0)
+  {
+    QVariantList values;
+    for (double v = min; v <= max; v += step)
+      addPossibleValue(QString::number(v), v);
+  }
+
+  // goes back to use the default
+  void reset()
+  {
+    m_value.clear();
+  }
+
+  QVariantMap descriptions() const
+  {
+    QVariantMap ret;
+    ret.insert("key", m_key);
+
+    if (!m_possibleValues.isEmpty())
+      ret.insert("options", m_possibleValues);
+
+    return ret;
+  }
+
+  void setIndexOrder(int order)
+  {
+    m_indexOrder = order;
+  }
+
+  int indexOrder() const { return m_indexOrder; }
+
+private:
+  QString m_key;
+  QVariant m_value;
+  QVariant m_defaultValue;
+  QVariantList m_possibleValues;
+  quint8 m_platform;
+  bool m_hidden;
+
+  int m_indexOrder;
+};
+
+#endif //KONVERGO_SETTINGS_VALUE_H
+
diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
new file mode 100644
index 0000000..ec986f1
--- /dev/null
+++ b/src/shared/CMakeLists.txt
@@ -0,0 +1,11 @@
+include_directories(${PROJECT_SOURCE_DIR}/src)
+
+add_library(shared STATIC
+  Paths.cpp Paths.h
+  LocalJsonClient.cpp LocalJsonClient.h
+  LocalJsonServer.cpp LocalJsonServer.h
+  UniqueApplication.h
+  ${CMAKE_BINARY_DIR}/src/Version.cpp
+  ${CMAKE_CURRENT_BINARY_DIR}/Names.cpp Names.h)
+
+set_target_properties(shared PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED TRUE)
\ No newline at end of file
diff --git a/src/shared/LocalJsonClient.cpp b/src/shared/LocalJsonClient.cpp
new file mode 100644
index 0000000..dfc1b3f
--- /dev/null
+++ b/src/shared/LocalJsonClient.cpp
@@ -0,0 +1,35 @@
+//
+// Created by Tobias Hieta on 30/08/15.
+//
+
+#include "Paths.h"
+#include "LocalJsonClient.h"
+#include "LocalJsonServer.h"
+#include "utils/Utils.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+LocalJsonClient::LocalJsonClient(const QString serverPath, QObject* parent) : QLocalSocket(parent)
+{
+  m_serverPath = Paths::dataDir(serverPath);
+  connect(this, &QLocalSocket::readyRead, this, &LocalJsonClient::readyRead);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void LocalJsonClient::connectToServer()
+{
+  QLocalSocket::connectToServer(m_serverPath, QIODevice::ReadWrite);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool LocalJsonClient::sendMessage(const QVariantMap& message)
+{
+  return LocalJsonServer::sendMessage(message, this);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void LocalJsonClient::readyRead()
+{
+  QVariantList list = LocalJsonServer::readFromSocket(this);
+  foreach (const QVariant& msg, list)
+    emit messageReceived(msg.toMap());
+}
diff --git a/src/shared/LocalJsonClient.h b/src/shared/LocalJsonClient.h
new file mode 100644
index 0000000..259f33e
--- /dev/null
+++ b/src/shared/LocalJsonClient.h
@@ -0,0 +1,26 @@
+//
+// Created by Tobias Hieta on 30/08/15.
+//
+
+#ifndef KONVERGO_LOCALJSONCLIENT_H
+#define KONVERGO_LOCALJSONCLIENT_H
+
+#include <QLocalSocket>
+
+class LocalJsonClient : public QLocalSocket
+{
+  Q_OBJECT
+public:
+  explicit LocalJsonClient(const QString serverPath, QObject* parent = 0);
+  void connectToServer();
+  bool sendMessage(const QVariantMap& message);
+
+Q_SIGNALS:
+  void messageReceived(const QVariantMap& message);
+
+private:
+  Q_SLOT void readyRead();
+  QString m_serverPath;
+};
+
+#endif //KONVERGO_LOCALJSONCLIENT_H
diff --git a/src/shared/LocalJsonServer.cpp b/src/shared/LocalJsonServer.cpp
new file mode 100644
index 0000000..95865b2
--- /dev/null
+++ b/src/shared/LocalJsonServer.cpp
@@ -0,0 +1,104 @@
+//
+// Created by Tobias Hieta on 30/08/15.
+//
+
+#include "LocalJsonServer.h"
+#include "Paths.h"
+#include "QsLog.h"
+
+#include <QFile>
+
+/////////////////////////////////////////////////////////////////////////////////////////
+LocalJsonServer::LocalJsonServer(const QString& serverName, QObject* parent) : QObject(parent)
+{
+  m_server = new QLocalServer(this);
+  m_serverName = Paths::dataDir(serverName);
+
+  connect(m_server, &QLocalServer::newConnection, this, &LocalJsonServer::serverClientConnected);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool LocalJsonServer::listen()
+{
+  while (!m_server->listen(m_serverName))
+  {
+    if (m_server->serverError() == QAbstractSocket::AddressInUseError)
+    {
+      QFile(m_serverName).remove();
+      continue;
+    }
+
+    QLOG_WARN() << "Failed to listen to local socket:" << m_server->errorString();
+    return false;
+  }
+
+  QLOG_INFO() << "Listening to socket:" << m_serverName;
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void LocalJsonServer::serverClientConnected()
+{
+  QLocalSocket* socket = m_server->nextPendingConnection();
+  if (socket)
+  {
+    m_clientSockets << socket;
+    connect(socket, &QLocalSocket::readyRead, this, &LocalJsonServer::clientReadyRead);
+    emit clientConnected(socket);
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool LocalJsonServer::sendMessage(const QVariantMap& message, QLocalSocket* socket)
+{
+  QJsonObject obj = QJsonObject::fromVariantMap(message);
+
+  if (obj.isEmpty())
+    return false;
+
+  QJsonDocument doc(obj);
+  QByteArray data = doc.toJson(QJsonDocument::Compact);
+  data.append("\r\n");
+
+  if (!data.isEmpty())
+    return (socket->write(data) == data.size());
+
+  return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void LocalJsonServer::clientReadyRead()
+{
+  QLocalSocket* socket = dynamic_cast<QLocalSocket*>(sender());
+  if (!socket)
+    return;
+
+  QVariantList messages = readFromSocket(socket);
+  foreach (const QVariant& msg, messages)
+    emit messageReceived(msg.toMap());
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QVariantList LocalJsonServer::readFromSocket(QLocalSocket* socket)
+{
+  QVariantList lst;
+
+  while (socket->canReadLine())
+  {
+    QByteArray data = socket->readLine();
+    if (!data.isNull())
+    {
+      QJsonParseError err;
+      QJsonDocument doc = QJsonDocument::fromJson(data, &err);
+      if (doc.isNull())
+      {
+        QLOG_WARN() << "Failed to parse message from client:" << err.errorString();
+        continue;
+      }
+
+      lst << doc.toVariant();
+    }
+  }
+
+  return lst;
+}
\ No newline at end of file
diff --git a/src/shared/LocalJsonServer.h b/src/shared/LocalJsonServer.h
new file mode 100644
index 0000000..23fcd4d
--- /dev/null
+++ b/src/shared/LocalJsonServer.h
@@ -0,0 +1,37 @@
+//
+// Created by Tobias Hieta on 30/08/15.
+//
+
+#ifndef KONVERGO_LOCALJSONSEVER_H
+#define KONVERGO_LOCALJSONSEVER_H
+
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QJsonObject>
+#include <QJsonDocument>
+
+class LocalJsonServer : public QObject
+{
+  Q_OBJECT
+public:
+  explicit LocalJsonServer(const QString& serverName, QObject* parent = 0);
+
+  bool listen();
+  static bool sendMessage(const QVariantMap& message, QLocalSocket* socket);
+  static QVariantList readFromSocket(QLocalSocket* socket);
+
+Q_SIGNALS:
+  void clientConnected(QLocalSocket* socket);
+  void messageReceived(const QVariant& message);
+
+private Q_SLOTS:
+  void serverClientConnected();
+  void clientReadyRead();
+
+private:
+  QString m_serverName;
+  QLocalServer* m_server;
+  QList<QLocalSocket*> m_clientSockets;
+};
+
+#endif //KONVERGO_LOCALJSONSEVER_H
diff --git a/src/shared/Names.cpp.in b/src/shared/Names.cpp.in
new file mode 100644
index 0000000..e9fefb2
--- /dev/null
+++ b/src/shared/Names.cpp.in
@@ -0,0 +1,15 @@
+//
+// Created by Tobias Hieta on 11/09/15.
+//
+
+#include "Names.h"
+
+QString Names::MainName()
+{
+  return QString("@MAIN_NAME@");
+}
+
+QString Names::HelperName()
+{
+  return QString("@HELPER_NAME@");
+}
\ No newline at end of file
diff --git a/src/shared/Names.h b/src/shared/Names.h
new file mode 100644
index 0000000..b67eec6
--- /dev/null
+++ b/src/shared/Names.h
@@ -0,0 +1,16 @@
+//
+// Created by Tobias Hieta on 11/09/15.
+//
+
+#ifndef NAMES_H
+#define NAMES_H
+
+#include <QString>
+
+namespace Names
+{
+  QString MainName();
+  QString HelperName();
+};
+
+#endif //NAMES_H
diff --git a/src/shared/Paths.cpp b/src/shared/Paths.cpp
new file mode 100644
index 0000000..8885213
--- /dev/null
+++ b/src/shared/Paths.cpp
@@ -0,0 +1,74 @@
+//
+// Created by Tobias Hieta on 01/09/15.
+//
+
+#include "Paths.h"
+
+#include <QDir>
+#include <QStandardPaths>
+#include <QGuiApplication>
+#include <QsLog.h>
+#include <QtGui/qguiapplication.h>
+#include "Names.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+static QDir writableLocation(QStandardPaths::StandardLocation loc)
+{
+  QDir d(QStandardPaths::writableLocation(loc));
+  if (!d.mkpath(d.absolutePath() + "/" + Names::MainName()))
+  {
+    QLOG_WARN() << "Failed to create directory:" << d.absolutePath();
+    return QDir();
+  }
+
+  d.cd(Names::MainName());
+
+  return d;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString Paths::resourceDir(const QString& file)
+{
+  auto resourceDir = QDir(QGuiApplication::applicationDirPath());
+
+#ifdef Q_OS_MAC
+  resourceDir.cdUp();
+  resourceDir.cd("Resources");
+#endif
+
+  return resourceDir.filePath(file);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString Paths::dataDir(const QString& file)
+{
+  QDir d = writableLocation(QStandardPaths::GenericDataLocation);
+  if (file.isEmpty())
+    return d.absolutePath();
+  return d.filePath(file);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString Paths::cacheDir(const QString& file)
+{
+  QDir d = writableLocation(QStandardPaths::GenericCacheLocation);
+  if (file.isEmpty())
+    return d.absolutePath();
+  return d.filePath(file);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString Paths::logDir(const QString& file)
+{
+#ifdef Q_OS_MAC
+  QDir ldir = QDir(QStandardPaths::locate(QStandardPaths::HomeLocation, "", QStandardPaths::LocateDirectory));
+  ldir.mkpath(ldir.absolutePath() + "/Library/Logs/" + Names::MainName());
+  ldir.cd("Library/Logs/" + Names::MainName());
+  return ldir.filePath(file);
+#else
+  QDir ldir = writableLocation(QStandardPaths::GenericDataLocation);
+  ldir.mkpath(ldir.absolutePath() + "/logs");
+  ldir.cd("logs");
+  return ldir.filePath(file);
+#endif
+}
diff --git a/src/shared/Paths.h b/src/shared/Paths.h
new file mode 100644
index 0000000..e87fc54
--- /dev/null
+++ b/src/shared/Paths.h
@@ -0,0 +1,18 @@
+//
+// Created by Tobias Hieta on 01/09/15.
+//
+
+#ifndef KONVERGO_PATHS_H
+#define KONVERGO_PATHS_H
+
+#include <QString>
+
+namespace Paths
+{
+  QString resourceDir(const QString& file = QString());
+  QString dataDir(const QString& file = QString());
+  QString cacheDir(const QString& file = QString());
+  QString logDir(const QString& file = QString());
+};
+
+#endif //KONVERGO_PATHS_H
diff --git a/src/shared/UniqueApplication.h b/src/shared/UniqueApplication.h
new file mode 100644
index 0000000..44a09a4
--- /dev/null
+++ b/src/shared/UniqueApplication.h
@@ -0,0 +1,74 @@
+//
+// Created by Tobias Hieta on 27/08/15.
+//
+
+#ifndef KONVERGO_UNIQUEAPPLICATION_H
+#define KONVERGO_UNIQUEAPPLICATION_H
+
+#include <QObject>
+#include "Paths.h"
+#include "LocalJsonServer.h"
+#include "LocalJsonClient.h"
+#include "utils/Utils.h"
+
+#define SOCKET_NAME "pmpUniqueApplication"
+
+class UniqueApplication : public QObject
+{
+  Q_OBJECT
+public:
+  UniqueApplication(QObject* parent = 0, const QString& socketname = SOCKET_NAME) : QObject(parent)
+  {
+    m_socketName = socketname;
+  }
+
+  void listen()
+  {
+    m_server = new LocalJsonServer(m_socketName, this);
+
+    connect(m_server, &LocalJsonServer::messageReceived, [=](const QVariant& message)
+    {
+      QVariantMap map = message.toMap();
+      if (map.contains("command") && map.value("command").toString() == "appStart")
+        emit otherApplicationStarted();
+    });
+
+    if (!m_server->listen())
+      throw FatalException("Failed to listen to uniqueApp socket!");
+  }
+
+  bool ensureUnique()
+  {
+    auto socket = new LocalJsonClient(m_socketName, this);
+    socket->connectToServer();
+
+    // we will just assume that the app isn't running if we get a error here
+    if (!socket->waitForConnected(1000))
+    {
+      if (socket->error() != QLocalSocket::SocketTimeoutError)
+      {
+        // since we are unique we will start to listen and claim this socket.
+        listen();
+        return true;
+      }
+    }
+
+    QVariantMap m;
+    m.insert("command", "appStart");
+    socket->sendMessage(m);
+    socket->waitForBytesWritten(2000);
+
+    socket->close();
+    socket->deleteLater();
+
+    return false;
+  }
+
+  Q_SIGNAL void otherApplicationStarted();
+
+private:
+  LocalJsonServer* m_server;
+  QString m_socketName;
+};
+
+#endif //KONVERGO_UNIQUEAPPLICATION_H
diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
new file mode 100644
index 0000000..4edd725
--- /dev/null
+++ b/src/system/CMakeLists.txt
@@ -0,0 +1,6 @@
+if (OPENELEC)
+add_subdirectory(openelec)
+endif(OPENELEC)
+
+find_all_sources(. SRC)
+add_sources(${SRC})
\ No newline at end of file
diff --git a/src/system/OEUpdateManager.cpp b/src/system/OEUpdateManager.cpp
new file mode 100644
index 0000000..7a78576
--- /dev/null
+++ b/src/system/OEUpdateManager.cpp
@@ -0,0 +1,67 @@
+#include <QProcess>
+#include <QDir>
+#include "QsLog.h"
+#include "OEUpdateManager.h"
+#include "SystemComponent.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString OEUpdateManager::HaveUpdate()
+{
+  return "";
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool OEUpdateManager::applyUpdate(const QString& version)
+{
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void OEUpdateManager::doUpdate(const QString& version)
+{
+  // grab the update file
+  QString packagePath = GetPath("", version, true);
+  QDir packageDir(packagePath);
+
+  QStringList updateFiles = packageDir.entryList(QStringList( "*.tar"), QDir::Files, QDir::Time);
+
+  if (updateFiles.size())
+  {
+    // copy the update files to /storage/.update
+    QString destUpdatePath = "/storage/.update/" + updateFiles.at(0);
+    if (packageDir.rename(packagePath + updateFiles.at(0), destUpdatePath))
+    {
+      if (isMiniUpdateArchive(destUpdatePath))
+      {
+        // if we have a miniupdate, just exit
+        QLOG_DEBUG() << "Exiting to apply application update " << destUpdatePath;
+        SystemComponent::Get().exit();
+      }
+      else
+      {
+        // now reboot to do the update
+        QLOG_DEBUG() << "Rebooting to apply system update " << destUpdatePath;
+        QProcess::startDetached("reboot");
+      }
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool OEUpdateManager::isMiniUpdateArchive(QString archivePath)
+{
+  QProcess process;
+
+  process.start("/bin/tar", QStringList() << "-tf" << archivePath);
+  if (process.waitForFinished(1000) && (process.exitCode() == 0))
+  {
+    QByteArray output = process.readAllStandardOutput();
+    return output.contains(QByteArray("bin/") + Names::MainName().toUtf8());
+  }
+  else
+  {
+    QLOG_ERROR() << "Unable to list update archive files : " << QString(process.readAllStandardError());
+  }
+
+  return false;
+}
diff --git a/src/system/OEUpdateManager.h b/src/system/OEUpdateManager.h
new file mode 100644
index 0000000..c12c504
--- /dev/null
+++ b/src/system/OEUpdateManager.h
@@ -0,0 +1,20 @@
+#ifndef OEUPDATEMANAGER_H
+#define OEUPDATEMANAGER_H
+
+#include "UpdateManager.h"
+
+class OEUpdateManager : public UpdateManager
+{
+public:
+  OEUpdateManager(QObject *parent = 0) {};
+  ~OEUpdateManager() {};
+
+  virtual QString HaveUpdate();
+  virtual bool applyUpdate(const QString &version);
+  virtual void doUpdate(const QString& version);
+
+private:
+  bool isMiniUpdateArchive(QString archivePath);
+};
+
+#endif // OEUPDATEMANAGER_H
diff --git a/src/system/SystemComponent.cpp b/src/system/SystemComponent.cpp
new file mode 100644
index 0000000..7e32225
--- /dev/null
+++ b/src/system/SystemComponent.cpp
@@ -0,0 +1,267 @@
+#include <QSysInfo>
+#include <QProcess>
+#include <QMap>
+#include <QtNetwork/qnetworkinterface.h>
+#include <QGuiApplication>
+#include <QDesktopServices>
+
+#include "SystemComponent.h"
+#include "Version.h"
+#include "QsLog.h"
+#include "settings/SettingsComponent.h"
+#include "ui/KonvergoWindow.h"
+#include "Paths.h"
+#include "Names.h"
+
+#define MOUSE_TIMEOUT 5 * 1000
+
+#define KONVERGO_PRODUCTID_DEFAULT  3
+#define KONVERGO_PRODUCTID_OPENELEC 4
+
+// Platform types map
+QMap<SystemComponent::PlatformType, QString> platformTypeNames = { \
+  { SystemComponent::platformTypeOsx, "macosx" }, \
+  { SystemComponent::platformTypeWindows, "windows" },
+  { SystemComponent::platformTypeLinux, "linux" },
+  { SystemComponent::platformTypeUnknown, "unknown" },
+};
+
+// platform Archictecture map
+QMap<SystemComponent::PlatformArch, QString> platformArchNames = { \
+  { SystemComponent::platformArchX86, "x86" }, \
+  { SystemComponent::platformArchRpi2, "rpi2" },
+  { SystemComponent::platformArchUnknown, "unknown" }
+};
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+SystemComponent::SystemComponent(QObject* parent) : ComponentBase(parent), m_platformType(platformTypeUnknown), m_platformArch(platformArchUnknown), m_doLogMessages(false)
+{
+  m_mouseOutTimer = new QTimer(this);
+  m_mouseOutTimer->setSingleShot(true);
+  connect(m_mouseOutTimer, &QTimer::timeout, [&] () { setCursorVisibility(false); });
+
+  m_mouseOutTimer->start(MOUSE_TIMEOUT);
+
+// define OS Type
+#if defined(Q_OS_MAC)
+  m_platformType = platformTypeOsx;
+#elif defined(Q_OS_WIN)
+  m_platformType = platformTypeWindows;
+#elif defined(Q_OS_LINUX)
+  m_platformType = platformTypeLinux;
+#endif
+
+// define target type
+#if TARGET_RPI
+  m_platformArch = platformArchRpi2;
+#else
+  m_platformArch = platformArchX86;
+#endif
+
+#if KONVERGO_OPENELEC
+  m_platformModfiers << SYSTEM_MODIFIER_OPENELEC;
+#endif
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString SystemComponent::getPlatformTypeString() const
+{
+  return platformTypeNames[m_platformType];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString SystemComponent::getPlatformArchString() const
+{
+  return platformArchNames[m_platformArch];
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QVariantMap SystemComponent::systemInformation() const
+{
+  QVariantMap info;
+  QString build;
+  QString dist;
+  QString arch;
+  int productid = KONVERGO_PRODUCTID_DEFAULT;
+
+#ifdef Q_OS_WIN
+  arch = "x86";
+#else
+  arch = QSysInfo::currentCpuArchitecture();
+#endif
+
+  build = getPlatformTypeString();
+  dist = getPlatformTypeString();
+
+#if defined(KONVERGO_OPENELEC)
+  productid = KONVERGO_PRODUCTID_OPENELEC;
+  dist = "openelec";
+
+  if (m_platformArch == platformArchRpi2)
+  {
+    build = "rpi2";
+  }
+  else
+  {
+    build = "generic";
+  }
+#endif
+
+  
+  info["build"] = build + "-" + arch;
+  info["dist"] = dist;
+  info["version"] = Version::GetVersionString();
+  info["productid"] = productid;
+  
+ QLOG_DEBUG() << QString(
+                "System Information : build(%1)-arch(%2).dist(%3).version(%4).productid(%5)")
+                .arg(build)
+                .arg(arch)
+                .arg(dist)
+                .arg(Version::GetVersionString())
+                .arg(productid);
+ return info;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SystemComponent::exit()
+{
+  qApp->quit();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SystemComponent::restart()
+{
+  qApp->quit();
+  QProcess::startDetached(qApp->arguments()[0], qApp->arguments());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SystemComponent::info(QString text)
+{
+  if (QsLogging::Logger::instance().loggingLevel() <= QsLogging::InfoLevel)
+    QsLogging::Logger::Helper(QsLogging::InfoLevel).stream() << "JS:" << qPrintable(text);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void SystemComponent::setCursorVisibility(bool visible)
+{
+  if (visible)
+  {
+    m_mouseOutTimer->start(MOUSE_TIMEOUT);
+
+    while (qApp->overrideCursor())
+      qApp->restoreOverrideCursor();
+  }
+  else
+  {
+    if (!qApp->overrideCursor())
+    {
+      if (m_mouseOutTimer->isActive())
+        m_mouseOutTimer->stop();
+
+      qApp->setOverrideCursor(QCursor(Qt::BlankCursor));
+    }
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString SystemComponent::getUserAgent()
+{
+  QString userAgent = QString("Konvergo-%1-%2 %3").arg(getPlatformTypeString())
+                                                       .arg(getPlatformArchString())
+                                                       .arg(Version::GetVersionString());
+  if (m_platformModfiers.size())
+    userAgent += QString(" (%1)").arg(m_platformModfiers.join(','));
+
+  return userAgent;
+}
+
+#ifdef Q_OS_UNIX
+/////////////////////////////////////////////////////////////////////////////////////////
+QMap<QString, QString> SystemComponent::networkInterfaces()
+{
+  QMap<QString, QString> info;
+
+  foreach(const QNetworkInterface& interface, QNetworkInterface::allInterfaces())
+  {
+    if (interface.isValid() == false || (interface.hardwareAddress().isEmpty() == true) || interface.IsLoopBack == false)
+      continue;
+
+    QString interfaceName = QString("Interface%1 ").arg(interface.index());
+    info[interfaceName + "Name"] = interface.humanReadableName();
+    info[interfaceName + "HW address"] = interface.hardwareAddress();
+    info[interfaceName + "Status"] = (interface.flags() & QNetworkInterface::IsUp) ? "Up" : "Down";
+
+    int i = 0;
+    foreach(const QNetworkAddressEntry& address, interface.addressEntries())
+    {
+      info[interfaceName + QString("Address%1").arg(i)] = QString("%1/%2").arg(address.ip().toString()).arg(address.netmask().toString());
+      i++;
+    }
+  }
+  return info;
+}
+#endif
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString SystemComponent::debugInformation()
+{
+  QString debugInfo;
+  QTextStream stream(&debugInfo);
+
+  stream << "Plex Media Player" << endl;
+  stream << "  Version: " << Version::GetVersionString() << " built: " << Version::GetBuildDate() << endl;
+  stream << "  Web Client Version: " << Version::GetWebVersion() << endl;
+  stream << "  Platform: " << getPlatformTypeString() << "-" << getPlatformArchString() << endl;
+  stream << "  Qt version: " << qVersion() << endl;
+  stream << endl;
+
+  stream << "Files" << endl;
+  stream << "  Log file: " << Paths::logDir(Names::MainName() + ".log") << endl;
+  stream << "  Config file: " << Paths::dataDir(Names::MainName() + ".conf") << endl;
+  stream << endl;
+
+#ifdef Q_OS_UNIX
+  stream << "Network" << endl;
+  QMap<QString, QString> networks = networkInterfaces();
+  foreach(const QString& net, networks.keys())
+    stream << "  " << net << ": " << networks[net] << endl;
+#endif
+
+  stream << flush;
+  return debugInfo;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+int SystemComponent::networkPort() const
+{
+  return SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "webserverport").toInt();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QStringList SystemComponent::networkAddresses() const
+{
+  QStringList list;
+  foreach(const QHostAddress& address, QNetworkInterface::allAddresses())
+  {
+    if (! address.isLoopback() && (address.protocol() == QAbstractSocket::IPv4Protocol))
+      list << address.toString();
+  }
+
+  return list;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void SystemComponent::userInformation(const QVariantMap& userModel)
+{
+  QString username = userModel["username"].toString();
+  QLOG_DEBUG() << "Change user to " << username;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void SystemComponent::openExternalUrl(const QString& url)
+{
+  QDesktopServices::openUrl(QUrl(url));
+}
diff --git a/src/system/SystemComponent.h b/src/system/SystemComponent.h
new file mode 100644
index 0000000..7ee8a06
--- /dev/null
+++ b/src/system/SystemComponent.h
@@ -0,0 +1,81 @@
+#ifndef __SYSTEM_COMPONENT_H__
+#define __SYSTEM_COMPONENT_H__
+
+#include "ComponentManager.h"
+#include <QTimer>
+#include "utils/Utils.h"
+#include "Paths.h"
+#include "Names.h"
+
+// System modifiers
+#define SYSTEM_MODIFIER_OPENELEC "OpenELEC"
+
+class SystemComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(SystemComponent);
+
+public:
+  virtual bool componentExport() { return true; }
+  virtual const char* componentName() { return "system"; }
+  virtual bool componentInitialize() { return true; }
+
+  Q_INVOKABLE QVariantMap systemInformation() const;
+  Q_INVOKABLE void exit();
+  Q_INVOKABLE void restart();
+
+  Q_INVOKABLE void info(QString text);
+
+  Q_INVOKABLE void setCursorVisibility(bool visible);
+
+  Q_INVOKABLE QString getUserAgent();
+
+  Q_INVOKABLE QString debugInformation();
+
+  Q_INVOKABLE QString logFilePath() { return Paths::logDir(Names::MainName() + ".log"); }
+
+  Q_INVOKABLE QStringList networkAddresses() const;
+  Q_INVOKABLE int networkPort() const;
+
+  Q_INVOKABLE void userInformation(const QVariantMap& userModel);
+
+  Q_INVOKABLE void openExternalUrl(const QString& url);
+
+  // possible os types type enum
+  enum PlatformType
+  {
+    platformTypeUnknown,
+    platformTypeOsx,
+    platformTypeWindows,
+    platformTypeLinux
+  };
+
+  // possible values for target types
+  enum PlatformArch
+  {
+    platformArchUnknown,
+    platformArchX86,
+    platformArchRpi2
+  };
+
+  inline PlatformType getPlatformType() { return m_platformType; }
+  inline PlatformArch getPlatformArch() { return m_platformArch; }
+
+  QString getPlatformTypeString() const;
+  QString getPlatformArchString() const;
+
+  inline bool isOpenELEC() { return m_platformModfiers.contains(SYSTEM_MODIFIER_OPENELEC); }
+
+private:
+  SystemComponent(QObject* parent = 0);
+
+  static QMap<QString, QString> networkInterfaces();
+
+  QTimer* m_mouseOutTimer;
+  PlatformType m_platformType;
+  PlatformArch m_platformArch;
+  QStringList m_platformModfiers;
+  bool m_doLogMessages;
+};
+
+#endif
diff --git a/src/system/UpdateManager.cpp b/src/system/UpdateManager.cpp
new file mode 100644
index 0000000..94c84b4
--- /dev/null
+++ b/src/system/UpdateManager.cpp
@@ -0,0 +1,184 @@
+#include "QsLog.h"
+
+#include <QDir>
+#include <QStandardPaths>
+#include <QCoreApplication>
+#include <QProcess>
+#include "UpdateManager.h"
+#include "utils/Utils.h"
+#include "utils/HelperLauncher.h"
+#include "system/SystemComponent.h"
+
+#if KONVERGO_OPENELEC
+#include "OEUpdateManager.h"
+#endif
+
+UpdateManager* g_updateManager;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+UpdateManager* UpdateManager::Get()
+{
+  if (!g_updateManager)
+  {
+#if KONVERGO_OPENELEC
+    g_updateManager = new OEUpdateManager(NULL);
+#else
+    g_updateManager = new UpdateManager(NULL);
+#endif
+  }
+
+  return g_updateManager;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString UpdateManager::HaveUpdate()
+{
+  QDir updateDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/updates/");
+  if (!updateDir.exists())
+  {
+    QLOG_DEBUG() << "No Update directory found, exiting";
+    return "";
+  }
+  QStringList nonAppliedUpdates;
+
+  // sort update directories, sort by the newest directory first, that way
+  // we apply the latest update downloaded.
+  //
+  foreach (const QString& dir, updateDir.entryList(QDir::NoDotAndDotDot | QDir::Dirs, QDir::Time))
+  {
+    // check if this version has been applied
+    QString readyFile(GetPath("_readyToApply", dir, false));
+    QLOG_DEBUG() << "Checking for:" << readyFile;
+    if (QFile::exists(readyFile))
+    {
+      QLOG_DEBUG() << dir << "is not applied";
+      return dir;
+    }
+  }
+
+  QLOG_DEBUG() << "No valid/applicable update found.";
+  return "";
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool UpdateManager::applyUpdate(const QString& version)
+{
+  // make sure we have a manifest for this version.
+  QLOG_DEBUG() << "Applying Update to version" << version;
+
+  QString manifestPath = GetPath("manifest.xml.bz2", version, false);
+  QString packagePath = QFileInfo(manifestPath).dir().absolutePath() + "/packages";
+
+  if (!QFile(manifestPath).exists() || !QDir(packagePath).exists())
+  {
+    QLOG_ERROR() << "Could not find:" << manifestPath << "or" << packagePath;
+    return false;
+  }
+
+  QString updaterName("updater");
+#ifdef Q_OS_WIN
+  updaterName = "updater.exe";
+#endif
+
+  QFile updaterFile(Paths::resourceDir(updaterName));
+
+  if (!updaterFile.exists())
+  {
+    QLOG_ERROR() << "Missing updater:" << updaterFile.fileName();
+    return false;
+  }
+
+  // copy the updater to a temporary directory so that we don't overwrite it.
+  QString updaterPath = QDir::temp().absoluteFilePath(updaterName);
+
+  // we need to remove it first, since QFile::copy() will fail otherwise.
+  if (QFile::exists(updaterPath))
+  {
+    if (!QFile::remove(updaterPath))
+    {
+      QLOG_DEBUG() << "Failed to remove updater from " << updaterPath;
+    }
+  }
+
+  if (!QFile::copy(updaterFile.fileName(), updaterPath))
+  {
+    QLOG_ERROR() << "Failed to copy the updater to:" << updaterPath;
+    return false;
+  }
+
+  QStringList args;
+  args << "--script=" + manifestPath;
+  args << "--package-dir=" + packagePath;
+  args << "--auto-close";
+
+#ifdef Q_OS_MAC
+  args << "--install-dir=" + QDir(QCoreApplication::applicationDirPath() + "/../../").absolutePath();
+#else
+  args << "--install-dir=" + QDir(QCoreApplication::applicationDirPath()).absolutePath();
+#endif
+
+  args << "--wait=" + QString::number(QCoreApplication::applicationPid());
+
+  // beyond this point we don't want to try to install this update again.
+  QFile::remove(GetPath("_readyToApply", version, false));
+
+  QLOG_DEBUG() << "Executing:" << updaterPath << args;
+  QProcess* process = new QProcess(NULL);
+  if (process->startDetached(updaterPath, args, QDir::temp().absolutePath()))
+  {
+    QLOG_DEBUG() << "Updater running, shutting down Plex Media Player";
+
+    return true;
+  }
+
+  QLOG_ERROR() << "Failed to execute the updater";
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QString UpdateManager::GetPath(const QString& file, const QString& version, bool package)
+{
+  QString filePath(file);
+
+  // put the packages in the packages subdir.
+  if (package)
+    filePath = "packages/" + file;
+
+  return QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/updates/" + version + "/" + filePath;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void UpdateManager::doUpdate(const QString& version)
+{
+  QLOG_DEBUG() << "Update competed, restarting system";
+  if (!applyUpdate(version))
+  {
+    QLOG_ERROR() "Failed to apply update";
+  }
+  else
+  {
+    QLOG_DEBUG() "Update was applied successfully";
+  }
+
+  HelperLauncher::Get().stop();
+  SystemComponent::Get().exit();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool UpdateManager::CheckForUpdates()
+{
+  QString updateVersion = Get()->HaveUpdate();
+  if (!updateVersion.isEmpty())
+  {
+    QLOG_DEBUG() << "We want to apply update:" << updateVersion;
+
+    // if this call succeeds we need to shut down and let
+    // the updater do it's work. Otherwise we'll just
+    // start the application as normal and pretend that
+    // nothing happened
+    //
+    if (Get()->applyUpdate(updateVersion))
+      return true;
+  }
+  return false;
+}
\ No newline at end of file
diff --git a/src/system/UpdateManager.h b/src/system/UpdateManager.h
new file mode 100644
index 0000000..0084de4
--- /dev/null
+++ b/src/system/UpdateManager.h
@@ -0,0 +1,24 @@
+#ifndef UPDATEMANAGER_H
+#define UPDATEMANAGER_H
+
+#include <QObject>
+
+class UpdateManager : public QObject
+{
+  Q_OBJECT
+public:
+  static bool CheckForUpdates();
+
+  explicit UpdateManager(QObject *parent = 0) {};
+  ~UpdateManager() {};
+
+  static UpdateManager* Get();
+
+  virtual QString HaveUpdate();
+  virtual bool applyUpdate(const QString &version);
+  virtual void doUpdate(const QString& version);
+
+  static QString GetPath(const QString &file, const QString& version, bool package);
+};
+
+#endif // UPDATEMANAGER_H
diff --git a/src/system/UpdaterComponent.cpp b/src/system/UpdaterComponent.cpp
new file mode 100644
index 0000000..73a7286
--- /dev/null
+++ b/src/system/UpdaterComponent.cpp
@@ -0,0 +1,198 @@
+#include "UpdaterComponent.h"
+#include "QsLog.h"
+#include "utils/Utils.h"
+
+#include <QTimer>
+#include <QCoreApplication>
+#include <QStandardPaths>
+#include <QCryptographicHash>
+#include <QIODevice>
+#include <QNetworkReply>
+#include <QNetworkAccessManager>
+#include <QDir>
+#include <QFile>
+#include <QProcess>
+#include <QStringList>
+#include <utils/HelperLauncher.h>
+
+#include "settings/SettingsComponent.h"
+#include "UpdateManager.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+UpdaterComponent::UpdaterComponent(QObject *parent) : ComponentBase(parent), m_netManager(this)
+{
+  m_file = NULL;
+  m_manifest = NULL;
+
+  connect(&m_netManager, &QNetworkAccessManager::finished,
+          this, &UpdaterComponent::dlComplete);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void UpdaterComponent::dlComplete(QNetworkReply* reply)
+{
+  QLOG_DEBUG() << "Hello, dlComplete";
+  if (reply->error() == QNetworkReply::NoError)
+  {
+    QUrl redirectURL = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
+    QLOG_DEBUG() << "Redirect:" << redirectURL.toString();
+    if (!redirectURL.isEmpty())
+    {
+      // redirection, check that we get redirected to something we expect.
+      if (redirectURL.toString().startsWith("https://nightlies.plex.tv") ||
+          redirectURL.toString().startsWith("https://downloads.plex.tv"))
+      {
+        QNetworkReply* redirReply = m_netManager.get(QNetworkRequest(redirectURL));
+        if (m_manifest->m_reply == reply)
+          m_manifest->setReply(redirReply);
+        else if (m_file->m_reply == reply)
+        {
+          m_file->setReply(redirReply);
+          //connect(redirReply, &QNetworkReply::downloadProgress, this, &UpdaterComponent::downloadProgress);
+        }
+
+        QLOG_DEBUG() << "Redirecting to:" << redirectURL.toString();
+
+        return;
+      }
+    }
+  }
+  else
+  {
+    QLOG_ERROR() << "Error downloading:" << reply->url() << "-" << reply->errorString();
+    emit downloadError(reply->errorString());
+
+    if (m_hasManifest)
+      m_manifest->m_reply->abort();
+
+    m_file->m_reply->abort();
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void UpdaterComponent::downloadFile(Update* update)
+{
+  QNetworkRequest request(update->m_url);
+  request.setPriority(QNetworkRequest::LowPriority);
+  request.setAttribute(QNetworkRequest::BackgroundRequestAttribute, true);
+  if (update->setReply(m_netManager.get(request)))
+    QLOG_INFO() << "Downloading update:" << update->m_url << "to:" << update->m_localPath;
+  else
+    QLOG_ERROR() << "Failed to start download:" << update->m_url;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool UpdaterComponent::fileComplete(Update* update)
+{
+  Q_UNUSED(update);
+  if (m_file->isReady() && (m_manifest->isReady() || !m_hasManifest))
+  {
+    QLOG_DEBUG() << "Both files downloaded";
+    // create a file that shows that we are ready
+    // to apply this update
+    //
+    QFile readyFile(UpdateManager::GetPath("_readyToApply", m_version, false));
+    if (readyFile.open(QFile::WriteOnly))
+    {
+      readyFile.write("FOO");
+      readyFile.close();
+    }
+
+    emit downloadComplete(m_version);
+
+    delete m_file;
+    delete m_manifest;
+
+    m_file = NULL;
+    m_manifest = NULL;
+
+    return true;
+  }
+
+  if (update)
+  {
+    QLOG_DEBUG() << "File " << update->m_localPath << " download completed";
+  }
+
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void UpdaterComponent::downloadUpdate(const QVariantMap& updateInfo)
+{
+  if (isDownloading())
+    return;
+
+  QLOG_INFO() << updateInfo;
+
+  if (!updateInfo.contains("version") ||
+      !updateInfo.contains("manifestURL") || !updateInfo.contains("manifestHash") ||
+      !updateInfo.contains("fileURL") || !updateInfo.contains("fileHash") || !updateInfo.contains("fileName"))
+  {
+    QLOG_ERROR() << "updateInfo was missing fields required to carry out this action.";
+    return;
+  }
+
+  m_version = updateInfo["version"].toString();
+
+  m_manifest = new Update(updateInfo["manifestURL"].toString(),
+                          UpdateManager::GetPath("manifest.xml.bz2", m_version, false),
+                          updateInfo["manifestHash"].toString(), this);
+
+  // determine if we have a manifest (some distros don't like OE)
+  m_hasManifest = ((!m_manifest->m_url.isEmpty()) && (!m_manifest->m_hash.isEmpty()));
+
+  m_file = new Update(updateInfo["fileURL"].toString(),
+                      UpdateManager::GetPath(updateInfo["fileName"].toString(), m_version, true),
+                      updateInfo["fileHash"].toString(), this);
+
+
+  if (m_hasManifest)
+    connect(m_manifest, &Update::fileDone, this, &UpdaterComponent::fileComplete);
+
+  connect(m_file, &Update::fileDone, this, &UpdaterComponent::fileComplete);
+
+  // create directories we need
+  QDir dr(QFileInfo(m_file->m_localPath).dir());
+  if (!dr.exists())
+  {
+    if (!dr.mkpath("."))
+    {
+      QLOG_ERROR() << "Failed to create update directory:" << dr.absolutePath();
+      emit downloadError("Failed to create download directory");
+      return;
+    }
+  }
+
+  // this will first check if the files are done
+  // and in that case emit the done signal.
+  if (fileComplete(NULL))
+    return;
+
+  if (!m_manifest->isReady() && m_hasManifest)
+    downloadFile(m_manifest);
+
+  if (!m_file->isReady())
+    downloadFile(m_file);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool UpdaterComponent::isDownloading()
+{
+  if ((m_manifest && m_manifest->m_reply && m_manifest->m_reply->isRunning()) ||
+      (m_file && m_file->m_reply && m_file->m_reply->isRunning()))
+    return true;
+
+  return false;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void UpdaterComponent::doUpdate()
+{
+  // make sure we kill off the helper first:
+  HelperLauncher::Get().stop();
+  UpdateManager::Get()->doUpdate(m_version);
+}
+
+
diff --git a/src/system/UpdaterComponent.h b/src/system/UpdaterComponent.h
new file mode 100644
index 0000000..4f8417c
--- /dev/null
+++ b/src/system/UpdaterComponent.h
@@ -0,0 +1,164 @@
+#ifndef UPDATERCOMPONENT_H
+#define UPDATERCOMPONENT_H
+
+#include <QObject>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QCryptographicHash>
+#include <QFile>
+#include <QThread>
+#include <time.h>
+
+#include "ComponentManager.h"
+#include "QsLog.h"
+
+#include <time.h>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class Update : public QObject
+{
+  Q_OBJECT
+public:
+  Update(const QString& url = "", const QString& localPath = "",
+         const QString& hash = "", QObject* parent = NULL) : QObject(parent)
+  {
+    m_url = url;
+    m_localPath = localPath;
+    m_hash = hash;
+    m_reply = NULL;
+    m_openFile = new QFile(m_localPath);
+  }
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  bool setReply(QNetworkReply* reply)
+  {
+    if (m_reply)
+    {
+      disconnect(m_reply, 0, 0, 0);
+      m_reply->deleteLater();
+      m_openFile->close();
+    }
+
+    m_reply = reply;
+    m_timeStarted = time(NULL);
+
+    connect(m_reply, &QNetworkReply::readyRead, this, &Update::write);
+    connect(m_reply, &QNetworkReply::finished, this, &Update::finished);
+
+    if (m_openFile->open(QFile::WriteOnly))
+      return true;
+
+    m_reply->deleteLater();
+    m_reply = NULL;
+
+    return false;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  void write()
+  {
+    m_openFile->write(m_reply->read(m_reply->bytesAvailable()));
+    QThread::yieldCurrentThread();
+  }
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  void finished()
+  {
+    m_openFile->close();
+    m_reply->deleteLater();
+    m_reply = NULL;
+
+    QLOG_DEBUG() << "Update downloaded, took:" << time(NULL) - m_timeStarted << "seconds";
+
+    emit fileDone(this);
+  }
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  bool isReady()
+  {
+    if ((m_reply && m_reply->isRunning()) ||
+        (m_openFile && m_openFile->isOpen()))
+      return false;
+
+    QFile file(m_localPath);
+    if (file.exists())
+    {
+      QString fileHash = hashFile();
+      if (!fileHash.isEmpty() && fileHash == m_hash)
+        return true;
+    }
+
+    return false;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  QString hashFile()
+  {
+    QFile file(m_localPath);
+    QCryptographicHash hash(QCryptographicHash::Sha1);
+
+    if (file.open(QFile::ReadOnly))
+    {
+      while (!file.atEnd())
+        hash.addData(file.read(8192));
+
+      QByteArray binhash = hash.result();
+      return binhash.toHex();
+    }
+
+    return "";
+  }
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////
+  QString m_url;
+  QString m_localPath;
+  QString m_hash;
+
+  QNetworkReply* m_reply;
+  QFile* m_openFile;
+  time_t m_timeStarted;
+
+signals:
+  void fileDone(Update* update);
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class UpdaterComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(UpdaterComponent);
+
+public:
+  virtual bool componentExport() { return true; }
+  virtual const char* componentName() { return "updater"; }
+  virtual bool componentInitialize() { return true; }
+
+  Q_INVOKABLE void downloadUpdate(const QVariantMap &updateInfo);
+  Q_INVOKABLE void doUpdate();
+
+
+signals:
+  void downloadError(const QString& error);
+  void downloadComplete(const QString& version);
+  void downloadProgress(qint64 bytesReceived, qint64 total);
+
+private slots:
+  void dlComplete(QNetworkReply *reply);
+  bool fileComplete(Update *update);
+
+private:
+  explicit UpdaterComponent(QObject *parent = 0);
+
+  bool isDownloading();
+  void downloadFile(Update *update);
+
+  QString m_version;
+
+  Update* m_manifest;
+  Update* m_file;
+  bool m_hasManifest;
+
+  QNetworkAccessManager m_netManager;
+};
+
+#endif // UPDATERCOMPONENT_H
diff --git a/src/system/openelec/CMakeLists.txt b/src/system/openelec/CMakeLists.txt
new file mode 100644
index 0000000..feca048
--- /dev/null
+++ b/src/system/openelec/CMakeLists.txt
@@ -0,0 +1,2 @@
+find_all_sources(. SRC)
+add_sources(${SRC})
diff --git a/src/system/openelec/OESystemComponent.cpp b/src/system/openelec/OESystemComponent.cpp
new file mode 100644
index 0000000..0eac9fd
--- /dev/null
+++ b/src/system/openelec/OESystemComponent.cpp
@@ -0,0 +1,41 @@
+#include "settings/SettingsComponent.h"
+#include "OESystemComponent.h"
+#include "QsLog.h"
+#include <unistd.h>
+#include <QFile>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+OESystemComponent::OESystemComponent(QObject *parent) : ComponentBase(parent)
+{
+
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool OESystemComponent::componentInitialize()
+{
+  setHostName(SettingsComponent::Get().value(SETTINGS_SECTION_OPENELEC, "systemname").toString());
+
+  return true;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool OESystemComponent::setHostName(QString name)
+{
+  // first we change the hostname name for this session
+  char* hostname = name.toUtf8().data();
+  sethostname(hostname, strlen(hostname));
+
+  // then edit the hostname file so that its persistent
+  QFile file("/storage/.cache/hostname");
+  if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+  {
+    QLOG_ERROR() << "setHostName : Failed to open" << file.fileName();
+    return false;
+  }
+
+  QTextStream writer(&file);
+  writer << name;
+  file.close();
+
+  return true;
+}
diff --git a/src/system/openelec/OESystemComponent.h b/src/system/openelec/OESystemComponent.h
new file mode 100644
index 0000000..cc61616
--- /dev/null
+++ b/src/system/openelec/OESystemComponent.h
@@ -0,0 +1,23 @@
+#ifndef OESYSTEMCOMPONENT_H
+#define OESYSTEMCOMPONENT_H
+
+#include <QObject>
+
+#include "ComponentManager.h"
+
+class OESystemComponent : public ComponentBase
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(OESystemComponent)
+
+public:
+  OESystemComponent(QObject *parent = 0);
+
+  virtual bool componentExport() { return true; }
+  virtual const char* componentName() { return "oesystem"; }
+  virtual bool componentInitialize();
+
+  bool setHostName(QString name);
+};
+
+#endif // OESYSTEMCOMPONENT_H
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
new file mode 100644
index 0000000..3e7960b
--- /dev/null
+++ b/src/tools/CMakeLists.txt
@@ -0,0 +1,2 @@
+#add_subdirectory(socket-client)
+add_subdirectory(helper)
\ No newline at end of file
diff --git a/src/tools/helper/CMakeLists.txt b/src/tools/helper/CMakeLists.txt
new file mode 100644
index 0000000..97f5994
--- /dev/null
+++ b/src/tools/helper/CMakeLists.txt
@@ -0,0 +1,30 @@
+include_directories(${PROJECT_SOURCE_DIR}/src)
+
+add_executable(${HELPER_TARGET} WIN32
+  HelperMain.cpp
+  CrashUploader.cpp
+  CrashUploader.h
+  HelperSocket.cpp
+  HelperSocket.h
+)
+
+target_link_libraries(${HELPER_TARGET} ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} qslog shared)
+set_target_properties(${HELPER_TARGET} PROPERTIES
+  CXX_STANDARD 11
+  CXX_STANDARD_REQUIRED TRUE
+  OUTPUT_NAME ${HELPER_NAME}
+)
+
+if(APPLE)
+  set(PLATFORM_RESOURCE_SUFFIX /../Resources)
+endif(APPLE)
+
+add_custom_command(
+  TARGET ${HELPER_TARGET}
+  POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${HELPER_TARGET}> $<TARGET_FILE_DIR:${MAIN_TARGET}>${PLATFORM_RESOURCE_SUFFIX}
+)
+
+if(NOT APPLE)
+  install(TARGETS ${HELPER_TARGET} DESTINATION ${INSTALL_BIN_DIR})
+endif(NOT APPLE)
\ No newline at end of file
diff --git a/src/tools/helper/CrashUploader.cpp b/src/tools/helper/CrashUploader.cpp
new file mode 100644
index 0000000..06b1f70
--- /dev/null
+++ b/src/tools/helper/CrashUploader.cpp
@@ -0,0 +1,222 @@
+//
+// Created by Tobias Hieta on 26/08/15.
+//
+
+#include "CrashUploader.h"
+
+#include <QDir>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QHttpMultiPart>
+#include <QNetworkReply>
+#include <QEventLoop>
+#include <QFileInfo>
+#include <QSysInfo>
+
+#include "Paths.h"
+#include "Version.h"
+#include "utils/Utils.h"
+#include "QsLog.h"
+#include "HelperSettings.h"
+
+#define UPLOAD_URL "http://64.71.188.207:443/"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Delete crash dumps that are not from the current version. They are most likely useless.
+void CrashUploader::deleteOldCrashDumps()
+{
+  QDir dir(m_old);
+  foreach (const QString& entry, dir.entryList(QDir::Dirs | QDir::NoDot | QDir::NoDotDot))
+  {
+    if (entry != Version::GetCanonicalVersionString())
+    {
+      QDir subdir = dir;
+      if (subdir.cd(entry))
+      {
+        QLOG_INFO() << "Wiping uninteresting crashdumps:" << subdir.path();
+        subdir.removeRecursively();
+      }
+    }
+  }
+
+  // clean out any things that are in progress.
+  QDir progressDir(m_processing);
+  progressDir.removeRecursively();
+  QDir().mkpath(m_processing);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void CrashUploader::addFormField(QHttpMultiPart* multipart, const QString& name, const QString& value)
+{
+  QHttpPart textPart;
+  textPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"" + name + "\""));
+  textPart.setBody(value.toUtf8());
+  multipart->append(textPart);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void CrashUploader::uploadCrashDump(const QString& version, const QString& path)
+{
+  // move the file to the in progress directory so that we don't accidentially upload it twice
+  QString inProgressDir = m_processing + "/" + version + "/";
+  QDir().mkpath(inProgressDir);
+
+  QString inProgressPath = inProgressDir + QFileInfo(path).fileName();
+  QString uuid = QFileInfo(path).baseName();
+  QFile file(path);
+  file.rename(inProgressPath);
+  file.setFileName(inProgressPath);
+
+  QLOG_DEBUG() << "Crashdump:" << inProgressPath;
+
+  if (!file.open(QIODevice::ReadOnly))
+  {
+    QLOG_ERROR() << "Could not open crashdump file. will try again later.";
+    moveFileBackToIncoming(version, inProgressPath);
+    m_scanTimer->start(5000);
+    return;
+  }
+
+  QLOG_INFO() << "Uploading crashdump:" << inProgressPath;
+
+  QNetworkRequest req(QUrl(UPLOAD_URL));
+
+  QHttpMultiPart* multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
+
+  addFormField(multiPart, "version", version);
+  addFormField(multiPart, "product", "plexmediaplayer");
+  addFormField(multiPart, "uuid", uuid);
+  addFormField(multiPart, "serverUuid", HelperSettings().value("clientId", "NOCLIENTID").toString());
+  addFormField(multiPart, "userId", HelperSettings().value("userId", "NOUSERID").toString());
+  addFormField(multiPart, "platform", QSysInfo::productType() + "-" + QSysInfo::currentCpuArchitecture());
+
+  QHttpPart dataPart;
+  dataPart.setHeader(QNetworkRequest::ContentTypeHeader, QVariant("application/octet-stream"));
+  dataPart.setHeader(QNetworkRequest::ContentDispositionHeader, QVariant("form-data; name=\"dumpfileb64\""));
+  dataPart.setBody(file.readAll().toBase64());
+  multiPart->append(dataPart);
+
+  QNetworkReply* reply = m_manager->post(req, multiPart);
+  multiPart->setParent(reply);
+
+  connect(reply, static_cast<void (QNetworkReply::*)()>(&QNetworkReply::finished), [=]()
+  {
+    QVariant statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+
+    // if we get a 503 code it means that we are either sending crashes to quickly or that
+    // the server doesn't want these any more. In any case we can just discard it and move
+    // forward with our lives.
+    //
+    if (!statusCode.isValid() || (statusCode.toInt() != 200 && statusCode.toInt() != 503))
+    {
+      QLOG_WARN() << "Failed to submit report with uuid:" << uuid << "will try again later";
+      moveFileBackToIncoming(version, inProgressPath);
+      m_scanTimer->start(5000);
+      return;
+    }
+
+    watchCrashDir(false);
+    QDir().mkpath(m_old + "/" + version);
+    QFile::rename(inProgressPath, m_old + "/" + version + "/" + QFileInfo(inProgressPath).fileName());
+    watchCrashDir(true);
+
+    if (statusCode.toInt() == 200)
+    {
+      QLOG_INFO() << "Submitted crash report with uuid:" << uuid;
+    }
+    else
+    {
+      QLOG_INFO() << "Server didn't want our crash report with uuid:" << uuid << "saving it in old for now";
+    }
+  });
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void CrashUploader::moveFileBackToIncoming(const QString& version, const QString& filename)
+{
+  watchCrashDir(false);
+  QFile::rename(filename, incomingCurrentVersion() + "/" + QFileInfo(filename).fileName());
+  watchCrashDir(true);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void CrashUploader::uploadAndDeleteCrashDumps()
+{
+  QMutexLocker lk(&m_scanLock);
+  QDir dir(m_incoming);
+
+  QStringList filters;
+  filters << "*.dmp";
+
+  QLOG_DEBUG() << "Scanning:" << dir.path() << "for crashdumps.";
+
+  watchCrashDir(false);
+
+  // loop over all incoming directories, should give us version numbers in d
+  foreach (const QString& version, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot))
+  {
+    QDir versionDir(dir);
+    versionDir.cd(version);
+
+    QLOG_DEBUG() << "Scanning:" << versionDir.path();
+
+    int numUploads = 0;
+    foreach (const QString& entry, versionDir.entryList(filters, QDir::Files))
+    {
+      // we only upload 20 crash reports per version
+      if (numUploads > 20)
+      {
+        QLOG_DEBUG() << "We have uploaded more than 20 crash reports, removing:" << entry;
+        QFile::remove(versionDir.filePath(entry));
+      }
+
+      uploadCrashDump(version, versionDir.filePath(entry));
+      numUploads ++;
+    }
+  }
+
+  watchCrashDir(true);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void CrashUploader::watchCrashDir(bool watch)
+{
+  if (watch)
+    m_watcher->addPath(incomingCurrentVersion());
+  else
+    m_watcher->removePath(incomingCurrentVersion());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+CrashUploader::CrashUploader(QObject* parent) : QObject(parent)
+{
+  m_manager = new QNetworkAccessManager(this);
+  m_watcher = new QFileSystemWatcher(this);
+  m_scanTimer = new QTimer(this);
+  m_scanTimer->setSingleShot(true);
+
+  connect(m_scanTimer, &QTimer::timeout, this, &CrashUploader::uploadAndDeleteCrashDumps);
+
+  connect(m_watcher, &QFileSystemWatcher::directoryChanged, [=](const QString& dir)
+  {
+    // wait 2 seconds before starting process dumps.
+    m_scanTimer->start(2000);
+  });
+
+  m_old = Paths::cacheDir("crashdumps/old");
+  m_processing = Paths::cacheDir("crashdumps/processing");
+  m_incoming = Paths::cacheDir("crashdumps/incoming");
+
+  startUploader();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool CrashUploader::startUploader()
+{
+  deleteOldCrashDumps();
+  uploadAndDeleteCrashDumps();
+
+  m_watcher->addPath(incomingCurrentVersion());
+
+  return true;
+}
diff --git a/src/tools/helper/CrashUploader.h b/src/tools/helper/CrashUploader.h
new file mode 100644
index 0000000..ea418e9
--- /dev/null
+++ b/src/tools/helper/CrashUploader.h
@@ -0,0 +1,41 @@
+//
+// Created by Tobias Hieta on 26/08/15.
+//
+
+#ifndef KONVERGO_CRASHUPLOADER_H
+#define KONVERGO_CRASHUPLOADER_H
+
+#include <QObject>
+#include <QMutex>
+#include <qhttpmultipart.h>
+#include <qnetworkreply.h>
+#include <qfilesystemwatcher.h>
+#include <qtimer.h>
+#include "Version.h"
+
+class CrashUploader : public QObject
+{
+  Q_OBJECT
+public:
+  CrashUploader(QObject* parent = 0);
+  bool startUploader();
+
+private:
+  Q_SLOT void uploadCrashDump(const QString& version, const QString& path);
+
+  QString incomingCurrentVersion() { return m_incoming + "/" + Version::GetVersionString(); }
+  void deleteOldCrashDumps();
+  void addFormField(QHttpMultiPart* multipart, const QString& name, const QString& value);
+  void uploadAndDeleteCrashDumps();
+  void moveFileBackToIncoming(const QString& version, const QString& filename);
+  void watchCrashDir(bool watch);
+
+  QNetworkAccessManager* m_manager;
+  QFileSystemWatcher* m_watcher;
+  QHash<QString, QString> m_urlToFileMap;
+  QString m_old, m_incoming, m_processing;
+  QTimer* m_scanTimer;
+  QMutex m_scanLock;
+};
+
+#endif //KONVERGO_CRASHUPLOADER_H
diff --git a/src/tools/helper/HelperMain.cpp b/src/tools/helper/HelperMain.cpp
new file mode 100644
index 0000000..9c8c240
--- /dev/null
+++ b/src/tools/helper/HelperMain.cpp
@@ -0,0 +1,66 @@
+//
+// Created by Tobias Hieta on 26/08/15.
+//
+
+#include <QCoreApplication>
+#include <UniqueApplication.h>
+#include "QsLog.h"
+#include "utils/Utils.h"
+#include "Version.h"
+#include "CrashUploader.h"
+#include "HelperSocket.h"
+#include "UniqueApplication.h"
+#include "Names.h"
+
+using namespace QsLogging;
+
+int main(int argc, char** argv)
+{
+  QCoreApplication app(argc, argv);
+  QCoreApplication::setApplicationName(Names::MainName());
+  QCoreApplication::setApplicationVersion(Version::GetVersionString());
+  QCoreApplication::setOrganizationDomain("plex.tv");
+
+  UniqueApplication uapp(NULL, "pmpHelperUniqueApplication");
+  if (!uapp.ensureUnique())
+  {
+    fprintf(stderr, "Other helper already running, refusing to start.\n");
+    return EXIT_FAILURE;
+  }
+
+  // Note where the logfile is going to be
+  qDebug("Logging to %s", qPrintable(Paths::logDir(Names::HelperName() + ".log")));
+
+  // init logging.
+  DestinationPtr dest = DestinationFactory::MakeFileDestination(
+    Paths::logDir("pmphelper.log"),
+    EnableLogRotation,
+    MaxSizeBytes(1024 * 1024),
+    MaxOldLogCount(2));
+
+  // make sure we get a fresh log
+  dest->rotate();
+
+  Logger::instance().addDestination(dest);
+  Logger::instance().setLoggingLevel(DebugLevel);
+
+  QLOG_DEBUG() << "Helper (" << Version::GetVersionString() << ") up and running";
+
+  QObject* helperObject = new QObject;
+
+  try
+  {
+    new CrashUploader(helperObject);
+    new HelperSocket(helperObject);
+  }
+  catch (FatalException& e)
+  {
+    qWarning() << "Failed to setup the helper:" << e.message();
+  }
+
+  app.exec();
+
+  delete helperObject;
+
+  return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/src/tools/helper/HelperSettings.h b/src/tools/helper/HelperSettings.h
new file mode 100644
index 0000000..640f879
--- /dev/null
+++ b/src/tools/helper/HelperSettings.h
@@ -0,0 +1,19 @@
+//
+// Created by Tobias Hieta on 01/09/15.
+//
+
+#ifndef KONVERGO_HELPERSETTINGS_H
+#define KONVERGO_HELPERSETTINGS_H
+
+#include <QSettings>
+#include "Paths.h"
+
+class HelperSettings : public QSettings
+{
+public:
+  HelperSettings() : QSettings(Paths::dataDir("helper.conf"), QSettings::IniFormat)
+  {
+  }
+};
+
+#endif //KONVERGO_HELPERSETTINGS_H
diff --git a/src/tools/helper/HelperSocket.cpp b/src/tools/helper/HelperSocket.cpp
new file mode 100644
index 0000000..5a58346
--- /dev/null
+++ b/src/tools/helper/HelperSocket.cpp
@@ -0,0 +1,57 @@
+//
+// Created by Tobias Hieta on 28/08/15.
+//
+
+#include "HelperSocket.h"
+#include "utils/Utils.h"
+#include "Version.h"
+#include "QsLog.h"
+#include "HelperSettings.h"
+
+#include <QCoreApplication>
+
+/////////////////////////////////////////////////////////////////////////////////////////
+HelperSocket::HelperSocket(QObject* parent)
+{
+  m_server = new LocalJsonServer("pmpHelper", this);
+
+  connect(m_server, &LocalJsonServer::clientConnected, this, &HelperSocket::clientConnected);
+  connect(m_server, &LocalJsonServer::messageReceived, this, &HelperSocket::message);
+
+  if (!m_server->listen())
+    throw FatalException("Could not listen to helper socket!");
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperSocket::clientConnected(QLocalSocket* socket)
+{
+  QLOG_DEBUG() << "Server connected.";
+  QVariantMap hello;
+  hello.insert("version", Version::GetVersionString());
+  hello.insert("path", QCoreApplication::applicationFilePath());
+  m_server->sendMessage(hello, socket);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperSocket::message(const QVariant& message)
+{
+  QVariantMap map = message.toMap();
+  if (map.contains("command"))
+  {
+    if (map.value("command").toString() == "quit")
+    {
+      QLOG_DEBUG() << "Asked to quit.";
+      qApp->quit();
+    }
+    else if (map.value("command").toString() == "info")
+    {
+      QLOG_DEBUG() << "Updating clientID.";
+      QVariantMap arg = map.value("argument").toMap();
+      if (arg.contains("clientId"))
+        HelperSettings().setValue("clientId", arg.value("clientId").toString());
+
+      if (arg.contains("userId"))
+        HelperSettings().setValue("userId", arg.value("userId").toString());
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/tools/helper/HelperSocket.h b/src/tools/helper/HelperSocket.h
new file mode 100644
index 0000000..2e21c8b
--- /dev/null
+++ b/src/tools/helper/HelperSocket.h
@@ -0,0 +1,23 @@
+//
+// Created by Tobias Hieta on 28/08/15.
+//
+
+#ifndef KONVERGO_HELPERSOCKET_H
+#define KONVERGO_HELPERSOCKET_H
+
+#include "Paths.h"
+#include "LocalJsonServer.h"
+
+class HelperSocket : public QObject
+{
+  Q_OBJECT
+public:
+  HelperSocket(QObject* parent = 0);
+
+private:
+  Q_SLOT void clientConnected(QLocalSocket* socket);
+  Q_SLOT void message(const QVariant& message);
+  LocalJsonServer* m_server;
+};
+
+#endif //KONVERGO_HELPERSOCKET_H
diff --git a/src/tools/socket-client/CMakeLists.txt b/src/tools/socket-client/CMakeLists.txt
new file mode 100644
index 0000000..7fb52e9
--- /dev/null
+++ b/src/tools/socket-client/CMakeLists.txt
@@ -0,0 +1,11 @@
+include_directories(${PROJECT_SOURCE_DIR}/src)
+
+add_executable(socket-client
+  SocketClient.cpp
+  $<TARGET_OBJECTS:shared>
+)
+set_target_properties(socket-client PROPERTIES
+  CXX_STANDARD 11
+  CXX_STANDARD_REQUIRED TRUE
+)
+target_link_libraries(socket-client ${Qt5Network_LIBRARIES} ${Qt5Core_LIBRARIES} qslog)
\ No newline at end of file
diff --git a/src/tools/socket-client/SocketClient.cpp b/src/tools/socket-client/SocketClient.cpp
new file mode 100644
index 0000000..9b44241
--- /dev/null
+++ b/src/tools/socket-client/SocketClient.cpp
@@ -0,0 +1,72 @@
+//
+// Created by Tobias Hieta on 26/08/15.
+//
+
+#include <QCoreApplication>
+#include <QLocalSocket>
+#include <qqueue.h>
+#include "LocalJsonClient.h"
+
+class SocketClient : public QObject
+{
+  Q_OBJECT
+public:
+  SocketClient() : QObject(NULL)
+  {
+    m_socket = new LocalJsonClient("inputSocket", this);
+    m_socket->connectToServer();
+
+    connect(m_socket, &LocalJsonClient::messageReceived, this, &SocketClient::gotMessage);
+  }
+
+  void sendCommand(const QString& command)
+  {
+    m_commands.enqueue(command);
+  }
+
+  Q_SLOT void gotMessage(const QVariantMap& message)
+  {
+    qDebug() << message;
+    doSendCommand();
+  }
+
+  void doSendCommand()
+  {
+    while (!m_commands.isEmpty())
+    {
+      QString cmd = m_commands.dequeue();
+
+      QVariantMap obj;
+      obj.insert("client", "socket-client");
+      obj.insert("source", "direct");
+      obj.insert("keycode", cmd);
+
+      m_socket->sendMessage(obj);
+
+      qDebug() << "Sending:" << cmd;
+    }
+
+    m_socket->waitForBytesWritten(60 * 1000);
+    m_socket->close();
+    exit(EXIT_SUCCESS);
+  }
+
+private:
+  LocalJsonClient* m_socket;
+  QQueue<QString> m_commands;
+};
+
+int main(int argc, char** argv)
+{
+  QCoreApplication app(argc, argv);
+
+  SocketClient* client = new SocketClient();
+
+  for (int i = 1; i < argc; i ++)
+    client->sendCommand(QString::fromUtf8(argv[i]));
+
+  return app.exec();
+}
+
+
+#include "SocketClient.moc"
\ No newline at end of file
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
new file mode 100644
index 0000000..fb59720
--- /dev/null
+++ b/src/ui/CMakeLists.txt
@@ -0,0 +1,2 @@
+find_all_sources(. UI_SRCS)
+add_sources(${UI_SRCS} webview.qml errormessage.qml)
diff --git a/src/ui/KonvergoEngine.h b/src/ui/KonvergoEngine.h
new file mode 100644
index 0000000..61d58f5
--- /dev/null
+++ b/src/ui/KonvergoEngine.h
@@ -0,0 +1,20 @@
+#ifndef KONVERGOENGINE_H
+#define KONVERGOENGINE_H
+
+#include <QQmlApplicationEngine>
+
+static QQmlApplicationEngine* g_qmlEngine = NULL;
+
+class KonvergoEngine
+{
+public:
+  static QQmlApplicationEngine* Get()
+  {
+    if (!g_qmlEngine)
+      g_qmlEngine = new QQmlApplicationEngine();
+
+    return g_qmlEngine;
+  }
+};
+
+#endif // KONVERGOENGINE_H
diff --git a/src/ui/KonvergoWindow.cpp b/src/ui/KonvergoWindow.cpp
new file mode 100644
index 0000000..184d358
--- /dev/null
+++ b/src/ui/KonvergoWindow.cpp
@@ -0,0 +1,349 @@
+#include "KonvergoWindow.h"
+#include <QTimer>
+#include <QJsonObject>
+#include <QScreen>
+#include <QQuickItem>
+#include <QGuiApplication>
+
+#include "input/InputKeyboard.h"
+#include "settings/SettingsComponent.h"
+#include "settings/SettingsSection.h"
+#include "system/SystemComponent.h"
+#include "player/PlayerComponent.h"
+#include "display/DisplayComponent.h"
+#include "QsLog.h"
+#include "power/PowerComponent.h"
+#include "utils/Utils.h"
+#include "KonvergoEngine.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+bool MouseEventFilter::eventFilter(QObject* watched, QEvent* event)
+{
+  SystemComponent& system = SystemComponent::Get();
+
+  if (event->type() == QEvent::KeyPress)
+  {
+    // In konvergo we intercept all keyboard events and translate them
+    // into web client actions. We need to do this so that we can remap
+    // keyboard buttons to different events.
+    //
+    QKeyEvent* kevent = dynamic_cast<QKeyEvent*>(event);
+    if (kevent)
+    {
+      system.setCursorVisibility(false);
+      if (kevent->spontaneous())
+      {
+        InputKeyboard::Get().keyPress(QKeySequence(kevent->key() | kevent->modifiers()));
+        return true;
+      }
+    }
+  }
+  else if (event->type() == QEvent::MouseMove)
+  {
+    system.setCursorVisibility(true);
+  }
+  else if (event->type() == QEvent::Wheel)
+  {
+    return true;
+  }
+  else if (event->type() == QEvent::MouseButtonPress)
+  {
+    // ignore right clicks that would show context menu
+    QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent*>(event);
+    if ((mouseEvent) && (mouseEvent->button() == Qt::RightButton))
+      return true;
+  }
+
+  return QObject::eventFilter(watched, event);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+KonvergoWindow::KonvergoWindow(QWindow* parent) : QQuickWindow(parent), m_debugLayer(false)
+{
+  // NSWindowCollectionBehaviorFullScreenPrimary is only set on OSX if Qt::WindowFullscreenButtonHint is set on the window.
+  setFlags(flags() | Qt::WindowFullscreenButtonHint);
+
+  m_eventFilter = new MouseEventFilter(this);
+  installEventFilter(m_eventFilter);
+
+  m_infoTimer = new QTimer(this);
+  m_infoTimer->setInterval(1000);
+
+  connect(m_infoTimer, &QTimer::timeout, this, &KonvergoWindow::updateDebugInfo);
+
+#ifdef TARGET_RPI
+  // On RPI, we use dispmanx layering - the video is on a layer below Konvergo,
+  // and during playback the Konvergo window is partially transparent. The OSD
+  // will be visible on top of the video as part of the Konvergo window.
+  setColor(QColor("transparent"));
+#else
+  setColor(QColor("black"));
+#endif
+
+  loadGeometry();
+
+  connect(SettingsComponent::Get().getSection(SETTINGS_SECTION_MAIN), &SettingsSection::valuesUpdated,
+          this, &KonvergoWindow::updateFullscreenSetting);
+
+  connect(this, &KonvergoWindow::visibilityChanged,
+          this, &KonvergoWindow::onVisibilityChanged);
+
+  connect(this, &KonvergoWindow::enableVideoWindowSignal,
+          this, &KonvergoWindow::enableVideoWindow, Qt::QueuedConnection);
+
+//  connect(QGuiApplication::desktop(), &QDesktopWidget::screenCountChanged,
+//              this, &KonvergoWindow::onScreenCountChanged);
+
+  connect(&PlayerComponent::Get(), &PlayerComponent::windowVisible,
+          this, &KonvergoWindow::playerWindowVisible);
+
+  connect(&PlayerComponent::Get(), &PlayerComponent::playbackStarting,
+          this, &KonvergoWindow::playerPlaybackStarting);
+
+  // this is using old syntax because ... reasons. QQuickCloseEvent is not public class
+  connect(this, SIGNAL(closing(QQuickCloseEvent*)), this, SLOT(closingWindow()));
+
+  // make sure that we handle some of the host commands that can be emitted
+  connect(&InputComponent::Get(), &InputComponent::receivedHostCommand,
+          this, &KonvergoWindow::handleHostCommand);
+
+  connect(qApp, &QCoreApplication::aboutToQuit, this, &KonvergoWindow::saveGeometry);
+
+#ifdef Q_OS_MAC
+    // this is such a hack. But I could not get it to enter into fullscreen
+    // mode if I didn't trigger this after a while.
+    //
+    QTimer::singleShot(500, [=]() {
+        updateFullscreenState();
+    });
+#else
+    if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "fakefullscreen").toBool())
+      updateFullscreenState();
+    else if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "fullscreen").toBool() || SystemComponent::Get().isOpenELEC())
+      setWindowState(Qt::WindowFullScreen);
+#endif
+
+  emit enableVideoWindowSignal();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::closingWindow()
+{
+  if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "fullscreen").toBool() == false)
+    saveGeometry();
+
+  qApp->quit();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+KonvergoWindow::~KonvergoWindow()
+{
+  removeEventFilter(m_eventFilter);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::saveGeometry()
+{
+  QRect rc = geometry();
+  QJsonObject obj;
+  obj.insert("x", rc.x());
+  obj.insert("y", rc.y());
+  obj.insert("width", rc.width());
+  obj.insert("height", rc.height());
+  SettingsComponent::Get().setValue(SETTINGS_SECTION_STATE, "geometry", obj.toVariantMap());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::loadGeometry()
+{
+  QRect rc = loadGeometryRect();
+  if (rc.isValid())
+    setGeometry(rc);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+QRect KonvergoWindow::loadGeometryRect()
+{
+  QJsonObject obj = QJsonObject::fromVariantMap(SettingsComponent::Get().value(SETTINGS_SECTION_STATE, "geometry").toMap());
+  if (obj.isEmpty())
+    return QRect();
+
+  QRect rc(obj["x"].toInt(), obj["y"].toInt(), obj["width"].toInt(), obj["height"].toInt());
+
+  if (rc.width() < 1280)
+    rc.setWidth(1280);
+
+  if (rc.height() < 720)
+    rc.setHeight(720);
+
+  // make sure our poisition is contained in one of the current screens
+  foreach (QScreen *screen, QGuiApplication::screens())
+  {
+    if (screen->availableGeometry().contains(rc))
+      return rc;
+  }
+
+ // otherwise default to center of current screen
+  return QRect((screen()->geometry().width() - geometry().width()) / 2,
+               (screen()->geometry().height() - geometry().height()) / 2,
+               geometry().width(),
+               geometry().height());
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::enableVideoWindow()
+{
+  PlayerComponent::Get().setWindow(this);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::setFullScreen(bool enable)
+{
+  QLOG_DEBUG() << "setting fullscreen = " << enable;
+
+  SettingsComponent::Get().setValue(SETTINGS_SECTION_MAIN, "fullscreen", enable);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::playerWindowVisible(bool visible)
+{
+  // adjust webengineview transparecy depending on player visibility
+  QQuickItem *web = findChild<QQuickItem *>("web");
+  if (web)
+    web->setProperty("backgroundColor", visible ? "transparent" : "#111111");
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::updateFullscreenSetting(const QVariantMap& values)
+{
+  if (values.find("fullscreen") == values.end())
+    return;
+
+  updateFullscreenState();
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::updateFullscreenState()
+{
+  if (SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "fullscreen").toBool() || SystemComponent::Get().isOpenELEC())
+  {
+    // if we were go from windowed to fullscreen
+    // we want to stor our current windowed position
+    if (!isFullScreen())
+      saveGeometry();
+
+      setVisibility(QWindow::FullScreen);
+  }
+  else
+  {
+    setVisibility(QWindow::Windowed);
+    loadGeometry();
+  }
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::onVisibilityChanged(QWindow::Visibility visibility)
+{
+  QLOG_DEBUG() << (visibility == QWindow::FullScreen ? "FullScreen" : "Windowed") << "visbility set to " << visibility;
+
+  if (visibility == QWindow::Windowed)
+    loadGeometry();
+
+  if (visibility == QWindow::FullScreen)
+    PowerComponent::Get().setFullscreenState(true);
+  else if (visibility == QWindow::Windowed)
+    PowerComponent::Get().setFullscreenState(false);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::playerPlaybackStarting()
+{
+#if defined(Q_OS_MAC)
+  // On OSX, initializing VideoTooolbox (hardware decoder API) will mysteriously
+  // show the hidden mouse pointer again. The VTDecompressionSessionCreate API
+  // function does this, and we have no influence over its behavior. To make sure
+  // the cursor is gone again when starting playback, listen to the player's
+  // playbackStarting signal, at which point decoder initialization is guaranteed
+  // to be completed. Then we just have to set the cursor again on the Cocoa level.
+  if (QGuiApplication::overrideCursor())
+    QGuiApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::RegisterClass()
+{
+  qmlRegisterType<KonvergoWindow>("Konvergo", 1, 0, "KonvergoWindow");
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::onScreenCountChanged(int newCount)
+{
+  updateFullscreenState();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::updateDebugInfo()
+{
+  if (m_debugInfo.size() == 0)
+    m_debugInfo = SystemComponent::Get().debugInformation();
+  m_videoInfo = PlayerComponent::Get().videoInformation();
+  emit debugInfoChanged();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void KonvergoWindow::handleHostCommand(QString hostCommand)
+{
+  QLOG_DEBUG() << "Got command:" << hostCommand;
+  QString arguments = "";
+  int arguments_start = hostCommand.indexOf(":");
+  if (arguments_start > 0)
+  {
+    arguments = hostCommand.mid(arguments_start + 1);
+    hostCommand = hostCommand.mid(0, arguments_start);
+  }
+  if (hostCommand == "fullscreen")
+  {
+    SettingsComponent::Get().setValue(SETTINGS_SECTION_MAIN, "fullscreen", !SettingsComponent::Get().value(SETTINGS_SECTION_MAIN, "fullscreen").toBool());
+  }
+  else if (hostCommand == "close")
+  {
+    close();
+  }
+  else if (hostCommand == "player")
+  {
+    PlayerComponent::Get().userCommand(arguments);
+  }
+  else if (hostCommand == "toggleDebug")
+  {
+    if (property("showDebugLayer").toBool())
+    {
+      m_infoTimer->stop();
+      setProperty("showDebugLayer", false);
+    }
+    else
+    {
+      m_infoTimer->start();
+      updateDebugInfo();
+      setProperty("showDebugLayer", true);
+    }
+  }
+  else if (hostCommand == "recreateRpiUi")
+  {
+    DisplayManager* display_manager = DisplayComponent::Get().getDisplayManager();
+    if (display_manager)
+      display_manager->resetRendering();
+  }
+  else if (hostCommand == "reload")
+  {
+    emit reloadWebClient();
+  }
+  else if (hostCommand == "crash!")
+  {
+    *(volatile int*)0=0;
+  }
+  else
+  {
+    QLOG_WARN() << "unknown host command" << hostCommand;
+  }
+}
diff --git a/src/ui/KonvergoWindow.h b/src/ui/KonvergoWindow.h
new file mode 100644
index 0000000..e007965
--- /dev/null
+++ b/src/ui/KonvergoWindow.h
@@ -0,0 +1,76 @@
+#ifndef KONVERGOWINDOW_H
+#define KONVERGOWINDOW_H
+
+#include <QQuickWindow>
+#include <QEvent>
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class MouseEventFilter : public QObject
+{
+  Q_OBJECT
+public:
+  MouseEventFilter(QObject* parent = 0) : QObject(parent) {}
+
+protected:
+  bool eventFilter(QObject* watched, QEvent* event);
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+class KonvergoWindow : public QQuickWindow
+{
+  Q_OBJECT
+  Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenSwitched)
+  Q_PROPERTY(bool showDebugLayer MEMBER m_debugLayer NOTIFY debugLayerChanged)
+  Q_PROPERTY(QString debugInfo MEMBER m_debugInfo NOTIFY debugInfoChanged)
+  Q_PROPERTY(QString videoInfo MEMBER m_videoInfo NOTIFY debugInfoChanged)
+public:
+  static void RegisterClass();
+
+  KonvergoWindow(QWindow* parent = 0);
+  ~KonvergoWindow();
+
+  bool isFullScreen()
+  {
+    return ((flags() & Qt::FramelessWindowHint) || (visibility() == QWindow::FullScreen));
+  }
+
+  void setFullScreen(bool enable);
+
+  Q_SLOT void otherAppFocus()
+  {
+    setWindowState((Qt::WindowState)((windowState() & ~Qt::WindowMinimized) | Qt::WindowActive));
+    raise();
+  }
+
+Q_SIGNALS:
+  void fullScreenSwitched();
+  void enableVideoWindowSignal();
+  void debugLayerChanged();
+  void debugInfoChanged();
+  void reloadWebClient();
+
+private slots:
+  void closingWindow();
+  void enableVideoWindow();
+  void onVisibilityChanged(QWindow::Visibility visibility);
+  void updateFullscreenSetting(const QVariantMap& values);
+  void updateFullscreenState();
+  void onScreenCountChanged(int newCount);
+  void handleHostCommand(QString hostCommand);
+  void updateDebugInfo();
+  void playerWindowVisible(bool visible);
+  void playerPlaybackStarting();
+
+private:
+  void saveGeometry();
+  void loadGeometry();
+  QRect loadGeometryRect();
+
+private:
+  bool m_debugLayer;
+  MouseEventFilter* m_eventFilter;
+  QTimer* m_infoTimer;
+  QString m_debugInfo, m_videoInfo;
+};
+
+#endif // KONVERGOWINDOW_H
diff --git a/src/ui/errormessage.qml b/src/ui/errormessage.qml
new file mode 100644
index 0000000..de7c2f3
--- /dev/null
+++ b/src/ui/errormessage.qml
@@ -0,0 +1,22 @@
+import QtQuick 2.2
+import QtQuick.Dialogs 1.1
+
+MessageDialog {
+  id: messageDialog
+  title: errorTitle
+  text: errorTitle
+  informativeText: errorText
+  icon: StandardIcon.Critical
+  standardButtons: StandardButton.Help | StandardButton.Close
+
+  onRejected: {
+    Qt.quit()
+  }
+
+  onHelp: {
+    Qt.openUrlExternally("https://forums.plex.tv")
+    Qt.quit()
+  }
+
+  Component.onCompleted: visible = true
+}
diff --git a/src/ui/webview.qml b/src/ui/webview.qml
new file mode 100644
index 0000000..38e4fd0
--- /dev/null
+++ b/src/ui/webview.qml
@@ -0,0 +1,147 @@
+import QtQuick 2.4
+import Konvergo 1.0
+import QtWebEngine 1.1
+import QtWebChannel 1.0
+
+KonvergoWindow
+{
+  id: mainWindow
+  title: "Plex Media Player"
+  objectName: "mainWindow"
+  visible: true
+  minimumHeight: 720
+  minimumWidth: 1280
+
+  MpvVideo
+  {
+    id: video
+    objectName: "video"
+    // It's not a real item. Its renderer draws onto the view's background.
+    width: 0
+    height: 0
+    visible: false
+  }
+
+  WebEngineView
+  {
+    id: web
+    objectName: "web"
+    width: Math.min((parent.height * 16) / 9, parent.width)
+    height: Math.min((parent.width * 9) / 16, parent.height)
+    anchors.centerIn: parent
+    settings.errorPageEnabled: false
+    settings.localContentCanAccessRemoteUrls: true
+    profile.httpUserAgent: components.system.getUserAgent()
+    url: components.settings.value("path", "startupurl")
+
+    Component.onCompleted:
+    {
+      // set the transparency
+      // (setting this here as a UserAgent workaround at least for qt5.5)
+      backgroundColor : "#111111"
+      forceActiveFocus()
+      mainWindow.reloadWebClient.connect(reload)
+    }
+
+    onLoadingChanged:
+    {
+      // we use a timer here to switch to the webview since
+      // it take a few moments for the webview to render
+      // after it has loaded.
+      //
+      if (loadRequest.status == WebEngineView.LoadSucceededStatus)
+      {
+        console.log("Loaded web-client successfully from: " + web.url);
+      }
+      else if (loadRequest.status == WebEngineView.LoadFailedStatus)
+      {
+        errorLabel.visible = true
+        errorLabel.text = "Error loading client, this is bad and should not happen<br>" +
+                          "You can try to <a href='reload'>reload</a> or head to our <a href='http://plex.tv/support'>support page</a><br><br>Actual Error: <pre>" +
+                          loadRequest.url + "\n" + loadRequest.errorString + " [" + loadRequest.errorCode + "]</pre><br><br>" +
+                          "Provide the <a href='file://"+ components.system.logFilePath() + "'>logfile</a> as well."
+      }
+    }
+
+    onJavaScriptConsoleMessage:
+    {
+      components.system.info(message)
+    }
+
+    onCertificateError: {
+      error.ignoreCertificateError()
+      console.log(error.url + " :" + error.description + error.error)
+    }
+  }
+
+  Text
+  {
+    id: errorLabel
+    z: 5
+    anchors.centerIn: parent
+    color: "#999999"
+    linkColor: "#cc7b19"
+    text: "Generic error"
+    font.pixelSize: 32
+    font.bold: true
+    visible: false
+    verticalAlignment: Text.AlignVCenter
+    textFormat: Text.StyledText
+    onLinkActivated:
+    {
+      if (link == "reload")
+      {
+        web.reload()
+        errorLabel.visible = false
+      }
+      else
+      {
+        Qt.openUrlExternally(link)
+      }
+    }
+  }
+
+  Rectangle
+  {
+    id: debug
+    color: "black"
+    z: 10
+    anchors.centerIn: parent
+    width: parent.width
+    height: parent.height
+    opacity: 0.7
+    visible: mainWindow.showDebugLayer
+
+    Text
+    {
+      id: debugLabel
+      width: (parent.width - 50) / 2
+      height: parent.height - 25
+      anchors.left: parent.left
+      anchors.leftMargin: 25
+      anchors.top: parent.top
+      anchors.topMargin: 10
+      color: "white"
+      font.pixelSize: width / 45
+
+      text: mainWindow.debugInfo
+    }
+
+    Text
+    {
+      id: videoLabel
+      width: (parent.width - 50) / 2
+      height: parent.height - 25
+      anchors.right: parent.right
+      anchors.rightMargin: 25
+      anchors.top: parent.top
+      anchors.topMargin: 10
+      color: "white"
+      font.pixelSize: width / 45
+
+      text: mainWindow.videoInfo
+    }
+  }
+
+  property QtObject webChannel: web.webChannel
+}
\ No newline at end of file
diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt
new file mode 100644
index 0000000..e4cd81c
--- /dev/null
+++ b/src/utils/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+add_sources(
+  CachedRegexMatcher.cpp CachedRegexMatcher.h
+  PlatformUtils.cpp PlatformUtils.h
+  HelperLauncher.h HelperLauncher.cpp
+  Utils.cpp Utils.h
+)
+
+if(APPLE)
+  add_sources(HelperLaunchd.cpp HelperLaunchd.cpp)
+  add_subdirectory(osx)
+endif(APPLE)
diff --git a/src/utils/CachedRegexMatcher.cpp b/src/utils/CachedRegexMatcher.cpp
new file mode 100644
index 0000000..38d5e98
--- /dev/null
+++ b/src/utils/CachedRegexMatcher.cpp
@@ -0,0 +1,77 @@
+//
+// Created by Tobias Hieta on 20/08/15.
+//
+
+#include "CachedRegexMatcher.h"
+#include "QsLog.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool CachedRegexMatcher::addMatcher(const QString& pattern, const QVariant& result)
+{
+  QRegExp matcher(pattern);
+  if (!matcher.isValid())
+  {
+    QLOG_WARN() << "Could not compile pattern:" << pattern;
+    return false;
+  }
+
+  m_matcherList.push_back(qMakePair(matcher, result));
+  QLOG_DEBUG() << "Added pattern:" << matcher;
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QVariant CachedRegexMatcher::match(const QString& input)
+{
+  // first we check if this match has already happened before
+  if (m_matcherCache.contains(input))
+  {
+    QLOG_DEBUG() << "Found cached match for input:" << input;
+    return m_matcherCache.value(input);
+  }
+
+  // otherwise try to iterate our list and find a match
+  foreach(const MatcherValuePair& matcher, m_matcherList)
+  {
+    QRegExp re(matcher.first);
+
+    if (re.indexIn(input) != -1)
+    {
+      // found match
+      QLOG_DEBUG() << "Matched:" << "to pattern:" << re.pattern();
+
+      QVariant returnValue = matcher.second;
+
+      if (re.captureCount() > 0 && matcher.second.type() == QVariant::String)
+      {
+        QString value(matcher.second.toString());
+
+        QLOG_DEBUG() << "Captured:" << re.captureCount();
+        for (int i = 0; i < re.captureCount(); i ++)
+        {
+          QLOG_DEBUG() << "capture" << i+1 << ":" << re.cap(i+1);
+          value = value.arg(re.cap(i+1));
+        }
+        QLOG_DEBUG() << "After captures the final value is:" << value;
+        returnValue = QVariant(value);
+      }
+
+      // now cache the match and the final value
+      m_matcherCache.insert(input, returnValue);
+
+      return returnValue;
+    }
+  }
+
+  QLOG_DEBUG() << "No match for:" << input;
+
+  // no match at all
+  return QVariant();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void CachedRegexMatcher::clear()
+{
+  m_matcherCache.clear();
+  m_matcherList.clear();
+}
diff --git a/src/utils/CachedRegexMatcher.h b/src/utils/CachedRegexMatcher.h
new file mode 100644
index 0000000..608e8f4
--- /dev/null
+++ b/src/utils/CachedRegexMatcher.h
@@ -0,0 +1,30 @@
+//
+// Created by Tobias Hieta on 20/08/15.
+//
+
+#ifndef KONVERGO_CACHEDREGEXMATCHER_H
+#define KONVERGO_CACHEDREGEXMATCHER_H
+
+#include <QRegExp>
+#include <QVariant>
+#include <QString>
+#include <QHash>
+
+typedef QPair<QRegExp, QVariant> MatcherValuePair;
+typedef QList<MatcherValuePair> MatcherValueList;
+
+class CachedRegexMatcher : public QObject
+{
+public:
+  CachedRegexMatcher(QObject* parent = 0) : QObject(parent) {}
+
+  bool addMatcher(const QString& pattern, const QVariant& result);
+  QVariant match(const QString& input);
+  void clear();
+
+private:
+  MatcherValueList m_matcherList;
+  QHash<QString, QVariant> m_matcherCache;
+};
+
+#endif //KONVERGO_CACHEDREGEXMATCHER_H
diff --git a/src/utils/HelperLaunchd.cpp b/src/utils/HelperLaunchd.cpp
new file mode 100644
index 0000000..1b24020
--- /dev/null
+++ b/src/utils/HelperLaunchd.cpp
@@ -0,0 +1,141 @@
+//
+// Created by Tobias Hieta on 18/09/15.
+//
+
+#include <qstandardpaths.h>
+#include <qdir.h>
+
+#include "HelperLaunchd.h"
+
+#include "QsLog.h"
+#include "plistparser.h"
+#include "plistserializer.h"
+#include "HelperLauncher.h"
+
+#define LAUNCHCTL_PATH "/bin/launchctl"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+HelperLaunchd::HelperLaunchd(QObject* parent) : QObject(parent)
+{
+  m_launchctl = new QProcess(this);
+
+  connect(m_launchctl, static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error), [=](QProcess::ProcessError error){
+    QLOG_ERROR() << "When trying to execute launchctl:" << m_launchctl->errorString();
+  });
+
+  connect(m_launchctl, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), [=](int exitCode, QProcess::ExitStatus status){
+    if (status == QProcess::NormalExit)
+    {
+      QLOG_INFO() << "Ran launchctl successfully";
+    }
+    else
+    {
+      QLOG_ERROR() << "Failed to run launchctl:" << m_launchctl->errorString();
+    }
+  });
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString HelperLaunchd::launchPlistPath()
+{
+  QDir homeDir = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first();
+  if (homeDir.cd("Library") && homeDir.cd("LaunchAgents"))
+    return homeDir.filePath("tv.plex.player-helper.plist");
+  return "";
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool HelperLaunchd::checkHelperPath()
+{
+  QString plistFile = launchPlistPath();
+  if (!plistFile.isEmpty())
+  {
+    QFile fp(plistFile);
+    if (fp.open(QIODevice::ReadOnly))
+    {
+      PListParser parser;
+      QVariantMap plistValues = parser.parsePList(&fp).toMap();
+
+      return plistValues.value("Program").toString() == HelperLauncher::HelperPath();
+    }
+  }
+
+  return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool HelperLaunchd::writePlist()
+{
+  QVariantMap launchPlist;
+
+  launchPlist.insert("Label", "tv.plex.player");
+  launchPlist.insert("RunAtLoad", true);
+
+  QVariantMap keepAlive;
+  keepAlive.insert("SuccessfulExit", false);
+  launchPlist.insert("Keep-Alive", keepAlive);
+
+  launchPlist.insert("ProcessType", "Background");
+  launchPlist.insert("Program", HelperLauncher::HelperPath());
+
+  PListSerializer plistOut;
+  QString output = plistOut.toPList(launchPlist);
+
+  if (!output.isEmpty())
+  {
+    QFile fp(launchPlistPath());
+    if (fp.open(QIODevice::WriteOnly | QIODevice::Truncate))
+    {
+      fp.write(output.toUtf8());
+    }
+    else
+    {
+      QLOG_WARN() << "Failed to write launchd plist file:" << launchPlistPath();
+      return false;
+    }
+  }
+
+  return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool HelperLaunchd::loadHelper()
+{
+  QLOG_DEBUG() << "Loading helper";
+  QStringList args;
+  args << "load";
+  args << launchPlistPath();
+  m_launchctl->start(LAUNCHCTL_PATH, args);
+  m_launchctl->waitForFinished(5000);
+  return m_launchctl->exitStatus() == QProcess::NormalExit;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool HelperLaunchd::unloadHelper()
+{
+  QLOG_DEBUG() << "Unloading helper";
+  QStringList args;
+  args << "unload";
+  args << launchPlistPath();
+  m_launchctl->start(LAUNCHCTL_PATH, args);
+  m_launchctl->waitForFinished(5000);
+
+  return m_launchctl->exitStatus() == QProcess::NormalExit;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLaunchd::start()
+{
+  unloadHelper();
+
+  if (!checkHelperPath())
+    writePlist();
+
+  loadHelper();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLaunchd::stop()
+{
+  unloadHelper();
+}
diff --git a/src/utils/HelperLaunchd.h b/src/utils/HelperLaunchd.h
new file mode 100644
index 0000000..d72d61a
--- /dev/null
+++ b/src/utils/HelperLaunchd.h
@@ -0,0 +1,30 @@
+//
+// Created by Tobias Hieta on 18/09/15.
+//
+
+#ifndef PLEXTHEATER_HELPERLAUNCHD_H
+#define PLEXTHEATER_HELPERLAUNCHD_H
+
+#include <QObject>
+#include <QProcess>
+
+class HelperLaunchd : public QObject
+{
+  Q_OBJECT
+public:
+  HelperLaunchd(QObject* parent = 0);
+
+  void start();
+  void stop();
+
+private:
+  bool checkHelperPath();
+  bool writePlist();
+  bool loadHelper();
+  bool unloadHelper();
+  QString launchPlistPath();
+
+  QProcess* m_launchctl;
+};
+
+#endif //PLEXTHEATER_HELPERLAUNCHD_H
diff --git a/src/utils/HelperLauncher.cpp b/src/utils/HelperLauncher.cpp
new file mode 100644
index 0000000..b97a727
--- /dev/null
+++ b/src/utils/HelperLauncher.cpp
@@ -0,0 +1,182 @@
+//
+// Created by Tobias Hieta on 28/08/15.
+//
+
+#include "HelperLauncher.h"
+#include "QsLog.h"
+#include "settings/SettingsComponent.h"
+#include "settings/SettingsSection.h"
+#include "utils/Utils.h"
+#include "Names.h"
+
+#include <QTimer>
+
+/////////////////////////////////////////////////////////////////////////////////////////
+HelperLauncher::HelperLauncher(QObject* parent) : QObject(parent)
+{
+  start();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::start()
+{
+  m_jsonClient = new LocalJsonClient("pmpHelper");
+  connect(m_jsonClient, &QLocalSocket::connected, this, &HelperLauncher::didConnect);
+  connect(m_jsonClient, static_cast<void (QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), this, &HelperLauncher::socketError);
+  connect(m_jsonClient, &LocalJsonClient::messageReceived, this, &HelperLauncher::gotMessage);
+  connect(m_jsonClient, &QLocalSocket::disconnected, this, &HelperLauncher::socketDisconnect);
+
+#ifdef Q_OS_MAC
+  m_launchd = new HelperLaunchd(this);
+#endif
+
+  m_helperProcess = new QProcess(this);
+
+  connect(SettingsComponent::Get().getSection(SETTINGS_SECTION_WEBCLIENT), &SettingsSection::valuesUpdated, [=](const QVariantMap& values)
+  {
+    if (values.contains("clientID"))
+      updateClientId();
+  });
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool HelperLauncher::connectToHelper()
+{
+  if (m_jsonClient->state() == QLocalSocket::ConnectedState ||
+      m_jsonClient->state() == QLocalSocket::ConnectingState)
+    return true;
+
+  QLOG_DEBUG() << "Connecting to helper";
+  m_jsonClient->connectToServer();
+
+  return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+bool HelperLauncher::killHelper()
+{
+  QVariantMap msg;
+  msg.insert("command", "quit");
+  m_jsonClient->sendMessage(msg);
+
+  if (m_jsonClient->waitForBytesWritten(1000))
+  {
+    QLOG_DEBUG() << "Waiting for helper to die";
+    if (!m_jsonClient->waitForDisconnected(3000))
+    {
+      QLOG_ERROR() << "Helper refused to disconnect. Didn't it get the PM?";
+      return false;
+    }
+
+    QLOG_DEBUG() << "Helper gone";
+    return true;
+  }
+  return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::gotMessage(const QVariantMap& message)
+{
+  if (message.value("version").toString() != Version::GetVersionString() ||
+      message.value("path").toString() != HelperPath())
+  {
+    QLOG_WARN() << "Running helper does not match our current version. Killing it and starting a new one.";
+    killHelper();
+  }
+  else
+  {
+    QLOG_DEBUG() << "Helper is running version:" << message.value("version").toString();
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::socketError(QLocalSocket::LocalSocketError error)
+{
+  QLOG_DEBUG() << "Failed to connect to helper:" << m_jsonClient->errorString();
+
+  if (error == QLocalSocket::ConnectionRefusedError ||
+      error == QLocalSocket::ServerNotFoundError)
+    launch();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::socketDisconnect()
+{
+  QLOG_DEBUG() << "Disconnected from helper, trying to relaunch";
+  connectToHelper();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::updateClientId()
+{
+  // update clientId if we have it
+  if (!SettingsComponent::Get().value(SETTINGS_SECTION_WEBCLIENT, "clientID").toString().isEmpty())
+  {
+    QVariantMap msg;
+    msg.insert("command", "info");
+
+    QVariantMap arg;
+    arg.insert("clientId", SettingsComponent::Get().value(SETTINGS_SECTION_WEBCLIENT, "clientID").toString());
+
+    QString userId = Utils::CurrentUserId();
+    if (!userId.isEmpty())
+      arg.insert("userId", userId);
+
+    msg.insert("argument", arg);
+
+    m_jsonClient->sendMessage(msg);
+  }
+};
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::didConnect()
+{
+  QLOG_DEBUG() << "Connected to helper";
+  updateClientId();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::launch()
+{
+  QLOG_DEBUG() << "Launching helper:" << HelperPath();
+
+#ifdef Q_OS_MAC
+  m_launchd->start();
+#else
+  if (!m_helperProcess->startDetached(HelperPath(), QStringList()))
+  {
+    QLOG_ERROR() << "Failed to open helper: " + m_helperProcess->errorString();
+    throw FatalException("Failed to launch helper: " + m_helperProcess->errorString());
+  }
+#endif
+
+  QTimer::singleShot(1000, this, &HelperLauncher::connectToHelper);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString HelperLauncher::HelperPath()
+{
+  QString programName = Names::HelperName();
+#ifdef Q_OS_WIN
+  programName += ".exe";
+#endif
+
+  QString helperPath = SettingsComponent::Get().value(SETTINGS_SECTION_PATH, "helperprogram").toString();
+
+  // fallback to the resource dir
+  if (helperPath.isEmpty() || !QFile().exists(helperPath))
+    helperPath = Paths::resourceDir(programName);
+
+  if (!QFile().exists(helperPath))
+    throw FatalException("Can't find helper program");
+
+  return helperPath;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void HelperLauncher::stop()
+{
+  // this method needs to disconnect all signals from the helper as well, so it doesn't start up again.
+  disconnect(m_jsonClient);
+  killHelper();
+}
diff --git a/src/utils/HelperLauncher.h b/src/utils/HelperLauncher.h
new file mode 100644
index 0000000..f8ff9be
--- /dev/null
+++ b/src/utils/HelperLauncher.h
@@ -0,0 +1,53 @@
+//
+// Created by Tobias Hieta on 28/08/15.
+//
+
+#ifndef KONVERGO_HELPERLAUNCHER_H
+#define KONVERGO_HELPERLAUNCHER_H
+
+#include <QLocalSocket>
+#include <QObject>
+#include <QProcess>
+#include <QJsonObject>
+
+#include "LocalJsonClient.h"
+#include "tools/helper/HelperSocket.h"
+#include "Version.h"
+#include "utils/Utils.h"
+
+#ifdef Q_OS_MAC
+#include "HelperLaunchd.h"
+#endif
+
+class HelperLauncher : public QObject
+{
+  Q_OBJECT
+  DEFINE_SINGLETON(HelperLauncher)
+public:
+  bool connectToHelper();
+  static QString HelperPath();
+  void stop();
+  void start();
+
+private Q_SLOTS:
+  void gotMessage(const QVariantMap& message);
+  void socketError(QLocalSocket::LocalSocketError error);
+  void didConnect();
+  void launch();
+  void socketDisconnect();
+  bool killHelper();
+
+private:
+  explicit HelperLauncher(QObject* parent = 0);
+
+  QProcess* m_helperProcess;
+  LocalJsonClient* m_jsonClient;
+
+  void updateClientId();
+
+#ifdef Q_OS_MAC
+  HelperLaunchd* m_launchd;
+#endif
+};
+
+#endif //KONVERGO_HELPERLAUNCHER_H
diff --git a/src/utils/PlatformUtils.cpp b/src/utils/PlatformUtils.cpp
new file mode 100644
index 0000000..a76ab27
--- /dev/null
+++ b/src/utils/PlatformUtils.cpp
@@ -0,0 +1,19 @@
+//
+// Created by Tobias Hieta on 15/05/15.
+//
+
+#include "PlatformUtils.h"
+
+#ifdef Q_OS_UNIX
+#include <signal.h>
+#endif
+
+bool PlatformUtils::isProcessAlive(Q_PID pid)
+{
+#ifdef Q_OS_UNIX
+  int ret = kill(pid, 0);
+  return ret == 0;
+#endif
+
+  return false;
+}
\ No newline at end of file
diff --git a/src/utils/PlatformUtils.h b/src/utils/PlatformUtils.h
new file mode 100644
index 0000000..510913f
--- /dev/null
+++ b/src/utils/PlatformUtils.h
@@ -0,0 +1,18 @@
+//
+// Created by Tobias Hieta on 15/05/15.
+//
+
+#ifndef KONVERGO_PLATFORMUTILS_H
+#define KONVERGO_PLATFORMUTILS_H
+
+#include <QProcess>
+
+class PlatformUtils
+{
+public:
+  PlatformUtils() { }
+  static bool isProcessAlive(Q_PID pid);
+};
+
+
+#endif //KONVERGO_PLATFORMUTILS_H
diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
new file mode 100644
index 0000000..4b416ad
--- /dev/null
+++ b/src/utils/Utils.cpp
@@ -0,0 +1,98 @@
+#include "Utils.h"
+#include <QtGlobal>
+#include <QStandardPaths>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QDir>
+#include <QProcess>
+#include <QDateTime>
+#include <QHostInfo>
+#include <QJsonDocument>
+#include <QVariant>
+
+#include "settings/SettingsComponent.h"
+#include "settings/SettingsSection.h"
+
+#include "osx/OSXUtils.h"
+#include "QsLog.h"
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString Utils::ComputerName()
+{
+#ifdef Q_OS_MAC
+  return OSXUtils::computerName();
+#else
+  return QHostInfo::localHostName();
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QJsonDocument Utils::OpenJsonDocument(const QString& path, QJsonParseError* err)
+{
+  QFile fp(path);
+  QByteArray fdata;
+  QRegExp commentMatch("^\\s*(\\S+\\s*=([^\\//]|\\//?)*)?(//.*)?$");
+
+  if (fp.open(QFile::ReadOnly))
+  {
+    while(true)
+    {
+      QByteArray row = fp.readLine();
+
+      if (row.isEmpty())
+        break;
+
+      // filter all comments
+      if (commentMatch.indexIn(row) != -1)
+        continue;
+
+      fdata.append(row);
+    }
+
+    fp.close();
+  }
+
+  return QJsonDocument::fromJson(fdata, err);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+Platform Utils::CurrentPlatform()
+{
+#if defined(Q_OS_MAC)
+  return PLATFORM_OSX;
+#elif KONVERGO_OPENELEC
+  #if TARGET_RPI
+    return PLATFORM_OE_RPI;
+  #else
+    return PLATFORM_OE_X86;
+  #endif
+#elif defined(Q_OS_LINUX)
+  return PLATFORM_LINUX;
+#elif defined(Q_OS_WIN32)
+  return PLATFORM_WINDOWS;
+#else
+  return PLATFORM_UNKNOWN;
+#endif
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString Utils::CurrentUserId()
+{
+  SettingsSection* connections = SettingsComponent::Get().getSection("connections");
+  if (!connections)
+    return QString();
+
+  QVariant ulist = connections->value("users");
+  if (ulist.isValid())
+  {
+    QVariantList users = ulist.toList();
+    if (users.size() > 0)
+    {
+      QVariantMap user = users.at(0).toMap();
+      return user.value("id").toString();
+    }
+  }
+
+  return QString();
+}
diff --git a/src/utils/Utils.h b/src/utils/Utils.h
new file mode 100644
index 0000000..3aa88c2
--- /dev/null
+++ b/src/utils/Utils.h
@@ -0,0 +1,57 @@
+#ifndef UTILS_H
+#define UTILS_H
+
+#include <QString>
+#include <QUrl>
+#include <QVariant>
+#include <QException>
+#include <QtCore/qjsondocument.h>
+
+#ifdef Q_OS_MAC
+  #include "osx/OSXUtils.h"
+#endif
+
+#define DEFINE_SINGLETON(cls) \
+  public:                     \
+  static cls& Get()           \
+  {                           \
+    static cls __instance;    \
+    return __instance;        \
+  }                           \
+
+
+class FatalException : public QException
+{
+public:
+  explicit FatalException(const QString& message) : m_message(message) {}
+  const QString& message() const { return m_message; }
+
+  ~FatalException() throw() { }
+
+private:
+  QString m_message;
+};
+
+  enum Platform
+  {
+    PLATFORM_UNKNOWN = 0,
+    PLATFORM_OSX = (1 << 0),
+    PLATFORM_LINUX = (1 << 1),
+    PLATFORM_OE_X86 = (1 << 2),
+    PLATFORM_OE_RPI = (1 << 3),
+    PLATFORM_WINDOWS = (1 << 4),
+    PLATFORM_OE = (PLATFORM_OE_RPI | PLATFORM_OE_X86),
+    PLATFORM_ANY = (PLATFORM_OSX | PLATFORM_WINDOWS | PLATFORM_LINUX | PLATFORM_OE)
+  };
+
+#define PLATFORM_ANY_EXCEPT(x) (PLATFORM_ANY & (~(x)))
+
+namespace Utils
+{
+  Platform CurrentPlatform();
+  QJsonDocument OpenJsonDocument(const QString& path, QJsonParseError* err);
+  QString CurrentUserId();
+  QString ComputerName();
+}
+
+#endif // UTILS_H
diff --git a/src/utils/osx/CMakeLists.txt b/src/utils/osx/CMakeLists.txt
new file mode 100644
index 0000000..e533a89
--- /dev/null
+++ b/src/utils/osx/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(OSXUTILS_SRC OSXUtils.h OSXUtils.mm)
+add_sources(${OSXUTILS_SRC})
+
diff --git a/src/utils/osx/OSXUtils.h b/src/utils/osx/OSXUtils.h
new file mode 100644
index 0000000..a0614fd
--- /dev/null
+++ b/src/utils/osx/OSXUtils.h
@@ -0,0 +1,13 @@
+#ifndef OSXUTILS_H
+#define OSXUTILS_H
+
+#include <QString>
+
+class OSXUtils
+{
+public:
+  static void SetMenuBarVisible(bool visible);
+  static QString computerName();
+};
+
+#endif /* OSXUTILS_H */
diff --git a/src/utils/osx/OSXUtils.mm b/src/utils/osx/OSXUtils.mm
new file mode 100644
index 0000000..86220ad
--- /dev/null
+++ b/src/utils/osx/OSXUtils.mm
@@ -0,0 +1,24 @@
+#include "OSXUtils.h"
+#import <Cocoa/Cocoa.h>
+
+/////////////////////////////////////////////////////////////////////////////////////////
+void OSXUtils::SetMenuBarVisible(bool visible)
+{
+  if(visible)
+  {
+    [[NSApplication sharedApplication]
+      setPresentationOptions:   NSApplicationPresentationDefault];
+  }
+  else
+  {
+    [[NSApplication sharedApplication]
+      setPresentationOptions:   NSApplicationPresentationHideMenuBar |
+                                NSApplicationPresentationHideDock];
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+QString OSXUtils::computerName()
+{
+  return QString::fromNSString([[NSHost currentHost] localizedName]);
+}
diff --git a/vagrant/ubuntu-x86_64/Vagrantfile b/vagrant/ubuntu-x86_64/Vagrantfile
new file mode 100644
index 0000000..aee686b
--- /dev/null
+++ b/vagrant/ubuntu-x86_64/Vagrantfile
@@ -0,0 +1,21 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.synced_folder "../..", "/source", type: "nfs"
+  config.vm.network "private_network", type: :dhcp
+
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 4096
+    v.cpus = 4
+  end
+
+  config.vm.provision :shell, path: "bootstrap.sh"
+
+end
diff --git a/vagrant/ubuntu-x86_64/bootstrap.sh b/vagrant/ubuntu-x86_64/bootstrap.sh
new file mode 100755
index 0000000..aa8995d
--- /dev/null
+++ b/vagrant/ubuntu-x86_64/bootstrap.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+if [ ! -e /swapfile ]; then
+  fallocate -l 16G /swapfile
+  chmod 600 /swapfile
+  mkswap /swapfile
+  swapon /swapfile
+  echo "/swapfile none swap sw 0 0" >>/etc/fstab
+fi
+
+cp /vagrant/sources.list /etc/apt/sources.list
+
+add-apt-repository -y ppa:beineri/opt-qt55-trusty
+apt-get update -y
+apt-get upgrade -y
+apt-get install -y git cmake ninja-build build-essential libssl-dev libgles2-mesa-dev qt54-meta-full pkg-config autoconf libtool libfreetype6-dev libfribidi-dev libfontconfig-dev libharfbuzz-dev yasm libgnutls-dev libbz2-dev libxrandr-dev libglew-dev libsdl2-dev libcec-dev
+
+sudo -u vagrant cp /vagrant/build-deps.sh .
+chmod 755 build-deps.sh
+sudo -u vagrant ./build-deps.sh
\ No newline at end of file
diff --git a/vagrant/ubuntu-x86_64/build-deps.sh b/vagrant/ubuntu-x86_64/build-deps.sh
new file mode 100755
index 0000000..09e2306
--- /dev/null
+++ b/vagrant/ubuntu-x86_64/build-deps.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+rm -rf libass ffmpeg mpv
+
+git clone --depth 1 git://github.com/libass/libass
+git clone --depth 1 git://github.com/ffmpeg/ffmpeg
+git clone git://github.com/mpv-player/mpv
+
+cd libass
+./autogen.sh
+./configure
+make -j 4
+sudo make install
+
+cd ..
+
+cd ffmpeg
+./configure --enable-gnutls --enable-shared --disable-static
+make -j 4
+sudo make install
+
+cd ..
+
+cd mpv
+./bootstrap.py
+./waf configure --enable-libmpv-shared --disable-cplayer
+./waf build -j5
+sudo ./waf install
+
+cd ..
diff --git a/vagrant/ubuntu-x86_64/sources.list b/vagrant/ubuntu-x86_64/sources.list
new file mode 100644
index 0000000..6fe3ded
--- /dev/null
+++ b/vagrant/ubuntu-x86_64/sources.list
@@ -0,0 +1,4 @@
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-updates main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-backports main restricted universe multiverse
+deb mirror://mirrors.ubuntu.com/mirrors.txt trusty-security main restricted universe multiverse
\ No newline at end of file
diff --git a/vagrant/windows-x86_64/Vagrantfile b/vagrant/windows-x86_64/Vagrantfile
new file mode 100644
index 0000000..3007c36
--- /dev/null
+++ b/vagrant/windows-x86_64/Vagrantfile
@@ -0,0 +1,36 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  config.vm.box = "win8-konvergo"
+  config.vm.guest = :windows
+  config.vm.communicator = :winrm
+  config.winrm.timeout = 500
+  config.winrm.host = "127.0.0.1"
+  config.winrm.port = 55985
+  config.vm.synced_folder "../..", "/c/source/konvergo",
+    create: true,
+    type: "rsync",
+    rsync__exclude: ["dependencies", "vagrant", ".git"],
+    rsync__args: ["--verbose", "--archive", "--delete", "-zz"]
+  config.vm.synced_folder "../../../plex-dependency-builder", "/c/source/dep-builder",
+    create: true,
+    type: "rsync",
+    rsync__exclude: ["build", "output", ".git", "*.pyc"],
+    rsync__args: ["--verbose", "--archive", "--delete", "-zz"]
+  config.vm.network "forwarded_port", host: 33389, guest: 3389
+  config.ssh.private_key_path = "vagrant_insecure_key"
+
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 4096
+    v.cpus = 4
+    v.gui = true
+  end
+
+  #config.vm.provision :shell, path: "bootstrap.sh"
+
+end
diff --git a/vagrant/windows-x86_64/vagrant_insecure_key b/vagrant/windows-x86_64/vagrant_insecure_key
new file mode 100644
index 0000000..4635e5b
--- /dev/null
+++ b/vagrant/windows-x86_64/vagrant_insecure_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAxlu1Hgq4GRz6wtKUeLbYqOp1E41jkxam+v+t/l7YyBOECjo5
+gAjt0WBmjmz/JCLaVyEclJE6IE+68D9ADgLS9uMDOhjTPIwUEODaevfPQVoD+TKk
+JsV9eNVw2PHcWv/yFaj4NsLCZDDCkSdTZOwwUmh1Rwq2a8O/LCdEOEdtWMgyLZMW
+O3DpgHl2eUOicSYmnQR6yD+vRgQbDupDIj5xBGqDmNmJOguJFnnwuNUz/UONPWfQ
+NkI8EJtK29nC/kXI+suqi/Uf1dVIFK3snQ/DSxJ5kiuXN/u6WPqyx0BK00fMlHxA
+DBHAo13dIbxTdwsiE+lFlqpzOkfp3Kkzybl5EwIDAQABAoIBADJk1izduEvZCvQ4
+H7RTb9PqTPg8sZGK7b1S+9dmLVkXbDJU/IrEufa5sRR6KI/7stDz/pjYFJZk6y9i
+QlnM6eADaKx35iK5y9dF6PvYvXTy85N6BC49elUalOLo/3y3Db/m/7iZ3l0p7iSG
+gy9euiAVncYAuLvELWuARlqt+t/U+fRbhRdvwJMVunmWVMEKI2v41tvKHoIHP1hB
+alyVwDJ8D9Vog5WGykjrOlHkfMBzlKyXXQg0DR1LFlT7NxtRGGWi1mJANMGTz5Mw
+nrn+P2TRUHXYphMjFkX9oHuxFwYAwbBUZRln6VkYNS22e1wCA3Wdq5gnJKO65/MJ
+1FgkRNECgYEA8XTdXea3tzpHBIYffitmy92ZnFn7AF/ByG3beS26Hpn3e+zFKFjX
+HFuI3yloKnq+gxEKvzw1xd5LE0iybu2KsPkKN9IR4sAb24BGfUCpcnbf86EZIr6w
+6nMMC8bnjyMLr2DQgGqaf+KCPmW68uJdQfhLfOxVqV2Y0+6LSZpuVY8CgYEA0k5K
+IbL2JOpe4wADauqmaJV4K9IZ18PSbjB/kroO15AdchvSjnuBnKzVpo+o1mM9tiD8
+NQ3V472kU37Vl26cGfayeOPqNBvlgMR+xq8DD84wqJR26zyKqOPAHoJeCsM2H1Zy
+3lKylx3iwAIHsggwTCv1V+eyyAjJmQV9pr+wij0CgYAhMvNY/OcXv2CSY6qi227X
+6xE66ThU1dW8LDa4E6x6lqrrlCOLp6N0F7XbEUNsS9I0DTzQDIRMP4NNFHrMO8cN
+DED2aeDhr45lAN8wS5rAzU1/nw/oshV7NvRaDjA6gxQROhuQ/JdfrBJCaBRrXup5
+rp0agRhKID9qLGtkZGJ1SwKBgBIa31LrXzlqW+Ta+XBY5x6Vz5SmL8ddel42GqV9
+Ew4HwCE0t/nANDZSwsnmEDj0rjlhuZSvrjw+9Uii4Kx6v0GU9WRm6qC1zho50Fg2
+dOMFczbwIRS7T4yensmBm6r9h0lHXfg50lokHoM9KYBwKAhGuIZq0f9aklB0Io8a
+bY5ZAoGBAIk3P+uIsegkmgehFyxHx/GrahUbipOMo6a9njMAUsMRhWoLIs6oUQiC
+IJ/eHpon9QH8JgXTphnecvFCe70Puww6RHgE5PAX4sJmSE2CgtrDimh8DTLoFiAw
+EFSOHDquhX0fO03YzL9CKx+8lzQ0ISwseI07Uq1LKIyMEEW3O8Ps
+-----END RSA PRIVATE KEY-----
diff --git a/vagrant/windows-x86_64/vagrant_insecure_key.pub b/vagrant/windows-x86_64/vagrant_insecure_key.pub
new file mode 100644
index 0000000..c367e11
--- /dev/null
+++ b/vagrant/windows-x86_64/vagrant_insecure_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGW7UeCrgZHPrC0pR4ttio6nUTjWOTFqb6/63+XtjIE4QKOjmACO3RYGaObP8kItpXIRyUkTogT7rwP0AOAtL24wM6GNM8jBQQ4Np6989BWgP5MqQmxX141XDY8dxa//IVqPg2wsJkMMKRJ1Nk7DBSaHVHCrZrw78sJ0Q4R21YyDItkxY7cOmAeXZ5Q6JxJiadBHrIP69GBBsO6kMiPnEEaoOY2Yk6C4kWefC41TP9Q409Z9A2QjwQm0rb2cL+Rcj6y6qL9R/V1UgUreydD8NLEnmSK5c3+7pY+rLHQErTR8yUfEAMEcCjXd0hvFN3CyIT6UWWqnM6R+ncqTPJuXkT tru@imuc.local