diff --git a/CMakeLists.txt b/CMakeLists.txt
index afb8bc0..c19beb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ initAll()
 
 add_subdirectory(src/qTbot)
 
-if (DEFINED QTBOT_EXAMPLE)
+if (QTBOT_EXAMPLE)
     add_subdirectory(src/example)
 endif()
 
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt
index 1d74f76..1bba14a 100644
--- a/src/example/CMakeLists.txt
+++ b/src/example/CMakeLists.txt
@@ -69,11 +69,8 @@ if (ANDROID)
             "${qTbot_EXTRA_LIBS}")
 
     endif()
-    set(manifest_file "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml")
-    configure_file("${manifest_file}.in" ${manifest_file} @ONLY)
-
-    set(gradle_file "${CMAKE_CURRENT_SOURCE_DIR}/android/build.gradle")
-    configure_file("${gradle_file}.in" ${gradle_file} @ONLY)
+    configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/android/AndroidManifest.xml" @ONLY)
+    configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/android/build.gradle" @ONLY)
 
     file(GLOB java_files
        "android/src/com/quasarapp/androidtools/*.java"
@@ -101,10 +98,8 @@ else()
 
     message(GIT_COMMIT_COUNT = ${GIT_COMMIT_COUNT})
 
-    set(DeployFile "${CMAKE_CURRENT_SOURCE_DIR}/deploy/qTbot.json")
-    configure_file("${DeployFile}.in" ${DeployFile} @ONLY)
-
-    addDeployFromCustomFile("qTbot" ${DeployFile})
+    set(DeployFile )
+    configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/deploy/qTbot.json" @ONLY)
 
 endif()
 
diff --git a/src/qTbot/CMakeLists.txt b/src/qTbot/CMakeLists.txt
index 4ca7cc2..7001ca9 100644
--- a/src/qTbot/CMakeLists.txt
+++ b/src/qTbot/CMakeLists.txt
@@ -37,5 +37,4 @@ prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR} "${LANGS}")
 
 set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/src" CACHE STRING "" FORCE)
 
-set(global_file "${CMAKE_CURRENT_SOURCE_DIR}/src/public/qTbot/global.h")
-configure_file("${global_file}.in" ${global_file} @ONLY)
+configure_file_in(${CURRENT_PROJECT} "${CMAKE_CURRENT_SOURCE_DIR}/src/public/qTbot/global.h")
diff --git a/src/qTbot/src/public/qTbot/global.h b/src/qTbot/src/public/qTbot/global.h
index 74c7214..744f199 100644
--- a/src/qTbot/src/public/qTbot/global.h
+++ b/src/qTbot/src/public/qTbot/global.h
@@ -10,7 +10,7 @@
 
 #include <QtCore/qglobal.h>
 
-#define QTBOT_VERSION "0.28.fa99f10"
+#define QTBOT_VERSION "0.30.efa3b97"
 
 #if defined(QTBOT_LIBRARY)
 #  define QTBOT_EXPORT Q_DECL_EXPORT