diff --git a/CMakeLists.txt b/CMakeLists.txt
index d68f4de..f995a41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,21 +110,20 @@ ENDIF()
 # Configuration
 ######################################################################################
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PlaYUVerUpdate.xml.in ${CMAKE_BINARY_DIR}/PlaYUVerUpdate.xml @ONLY)
 
 ######################################################################################
 # Target App
 ######################################################################################
-IF (NOT CMAKE_BUILD_TYPE)
+IF (NOT CMAKE_BUILD_TYPE )
     MESSAGE(STATUS "No build type selected, default to Release")
     SET(CMAKE_BUILD_TYPE "Release")
 ENDIF()
 
 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
-
-IF( PLAYUVER_WERROR )
-  SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
-ENDIF()
+# 
+# IF( PLAYUVER_WERROR )
+#   SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" )
+# ENDIF()
 
 SET( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g" )
 SET( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2" )
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 544d15f..8f5de88 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -3,7 +3,12 @@
 ###
 
 # This is hard way - please fix
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/external ${CMAKE_SOURCE_DIR}/modules ${CMAKE_BINARY_DIR}/modules )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../
+                     ${CMAKE_CURRENT_SOURCE_DIR}
+                     ${CMAKE_CURRENT_SOURCE_DIR}/../
+                     ${CMAKE_CURRENT_SOURCE_DIR}/external
+                     ${CMAKE_CURRENT_SOURCE_DIR}/../modules
+                     ${CMAKE_CURRENT_BINARY_DIR}/../modules )
 
 set(plaYUver_App_SRCS
 # Main
diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
deleted file mode 100644
index 2ff2c33..0000000
--- a/cmake/GetGitRevisionDescription.cmake
+++ /dev/null
@@ -1,130 +0,0 @@
-# - 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_CURRENT_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()
-  # check if this is a submodule
-  if(NOT IS_DIRECTORY ${GIT_DIR})
-    file(READ ${GIT_DIR} submodule)
-    string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
-    get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-    get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
-  endif()
-  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
-
-    ${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/cmake/GetGitRevisionDescription.cmake.in b/cmake/GetGitRevisionDescription.cmake.in
deleted file mode 100644
index 8a085b2..0000000
--- a/cmake/GetGitRevisionDescription.cmake.in
+++ /dev/null
@@ -1,38 +0,0 @@
-# 
-# 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/cmake/PlaYUVerUpdate.xml.in b/cmake/PlaYUVerUpdate.xml.in
deleted file mode 100644
index a3ab311..0000000
--- a/cmake/PlaYUVerUpdate.xml.in
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rss
-	version="2.0"
-	xmlns:atom="http://www.w3.org/2005/Atom"
-	xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"
-	xmlns:fervor="https://github.com/pypt/fervor"
-	xmlns:dc="http://purl.org/dc/elements/1.1/">
-
-	<channel>
-		<title>Your Great App's Changelog</title>
-		<link>http://pypt.github.com/fervor/Appcast.xml</link>
-		<description>Most recent changes with links to updates.</description>
-		<language>en</language>
-		<atom:link href="http://pypt.github.com/fervor/Appcast.xml" rel="self" type="application/rss+xml" />
-
-		<item>
-			<title>Version @PLAYUVER_VERSION@</title>
-			<pubDate>Mon, 09 Jan 2006 19:20:11 +0000</pubDate>
-			<guid isPermaLink="true">http://htmlpreview.github.io/?https://github.com/pixlra/playuver/blob/@GIT_BRANCH@/resources/releaseNotes.html</guid>
-
-			<!-- One of those (<link> is preferred by Fervor, <sparkle:releaseNotesLink> is used by Sparkle) -->
-			<link>http://htmlpreview.github.io/?https://github.com/pixlra/playuver/blob/@GIT_BRANCH@/resources/releaseNotes.html</link> <!-- or -->
-			<sparkle:releaseNotesLink>http://htmlpreview.github.io/?https://github.com/pixlra/playuver/blob/@GIT_BRANCH@/resources/releaseNotes.html</sparkle:releaseNotesLink>
-
-			<!--
-				See QtGlobal's QT_OS_* constants for valid platform versions.
-			-->
-
-			<!-- Windows version. -->
-			<enclosure
-				url="http://sourceforge.net/projects/playuver/files/playuver-@PACK_NAME@_wQT5_wOpenCV-Windows-amd64.zip/download  "
-				fervor:version="2"
-				fervor:platform="Q_OS_WIN32"
-        fervor:dependencies="QT5OPENCV"
-				type="application/octet-stream" />
-
-			<!-- Linux version. -->
-      <enclosure
-				url="http://sourceforge.net/projects/playuver/files/playuver-@PACK_NAME@_wQT4_wFFmpeg_wOpenCV-Linux-amd64.zip/download"
-				fervor:version="2.0"
-				fervor:platform="Q_OS_LINUX"
-        fervor:dependencies="QT5OPENCVFFMPEG"
-				type="application/octet-stream" />
-      
-			<enclosure
-				url="http://sourceforge.net/projects/playuver/files/playuver-@PACK_NAME@_wQT4_wFFmpeg_wOpenCV-Linux-amd64.zip/download"
-				fervor:version="2.0"
-				fervor:platform="Q_OS_LINUX"
-        fervor:dependencies="QT4OPENCVFFMPEG"
-				type="application/octet-stream" />
-      
-      <enclosure
-				url="http://sourceforge.net/projects/playuver/files/playuver-@PACK_NAME@_wQT4_wOpenCV-Linux-amd64.zip/download"
-				fervor:version="2.0"
-				fervor:platform="Q_OS_LINUX"
-        fervor:dependencies="QT4OPENCV"
-				type="application/octet-stream" />
-
-		</item>
-
-	</channel>
-</rss>
diff --git a/cmake/PlaYUVerVersion.cmake b/cmake/PlaYUVerVersion.cmake
deleted file mode 100644
index 5569aec..0000000
--- a/cmake/PlaYUVerVersion.cmake
+++ /dev/null
@@ -1,47 +0,0 @@
-
-include(cmake/GetGitRevisionDescription.cmake)
-
-git_describe(__version --tags)
-
-string(REPLACE "-" ";" __version_list ${__version})
-list(GET __version_list 0 __version)
-list(LENGTH __version_list __version_list_size )
-IF( ${__version_list_size} GREATER 1 )
-  list(GET __version_list 1 PLAYUVER_VERSION_PATCH)
-ELSE()
-  SET( PLAYUVER_VERSION_PATCH 0 )
-ENDIF()
-
-string(REPLACE "." ";" __version_list ${__version})
-list(GET __version_list 0 PLAYUVER_VERSION_MAJOR)
-list(GET __version_list 1 PLAYUVER_VERSION_MINOR)
-
-
-SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")
-
-IF( ${PLAYUVER_VERSION_PATCH} EQUAL 0 )
-  SET( PACK_NAME "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}" )
-ELSE()
-  IF( NOT WIN32 )
-    execute_process(
-      COMMAND git rev-parse --abbrev-ref HEAD
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-      OUTPUT_VARIABLE GIT_BRANCH
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    SET( __version_name_deb ${GIT_BRANCH} )
-    STRING(REPLACE "master" "latest" __version_name_deb ${__version_name_deb}  )
-    STRING(REPLACE "devel" "experimental" __version_name_deb ${__version_name_deb} )
-
-    SET( PACK_NAME ${__version_name_deb} )
-  ELSE()
-    SET( PACK_NAME "latest" )
-  ENDIF()
-ENDIF()
-
-unset(__version_name_deb)
-unset(__version_list)
-unset(__version_list_size)
-unset(__version)
-
-
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 9299568..72eb6d6 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -2,7 +2,7 @@
 ### CMakeLists for playuver lib component
 ###
 
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ )
 
 set(plaYUver_Lib_SRCS
     # Frame
diff --git a/lib/PlaYUVerFrame.cpp b/lib/PlaYUVerFrame.cpp
index 8afca64..854f8ec 100644
--- a/lib/PlaYUVerFrame.cpp
+++ b/lib/PlaYUVerFrame.cpp
@@ -24,6 +24,7 @@
 
 #include "config.h"
 #include <cstdio>
+#include <cmath>
 #include "LibMemory.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerFramePixelFormats.h"
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index fef8861..703d107 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -2,7 +2,7 @@
 ### CMakeLists for playuver modules component
 ###
 
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )
 
 set(plaYUver_Mod_SRCS
   PlaYUVerModuleFactory.cpp