diff --git a/.gitignore b/.gitignore
index f611d08..c2f3b53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,5 +73,6 @@ build
 *.pc
 .DS_Store
 
+.idea
 
 
diff --git a/include/icelib.h b/include/icelib.h
index c0b9eeb..70e6153 100644
--- a/include/icelib.h
+++ b/include/icelib.h
@@ -9,7 +9,6 @@
 
 #include "sockaddr_util.h"
 #include "icelibtypes.h"
-#include "icelib_defines.h"
 
 #include <stdint.h>
 
diff --git a/include/icelib_defines.h b/include/icelib_config.h
similarity index 71%
rename from include/icelib_defines.h
rename to include/icelib_config.h
index a4ef671..46dc95f 100644
--- a/include/icelib_defines.h
+++ b/include/icelib_config.h
@@ -2,8 +2,8 @@
  *  See License file
  */
 
-#ifndef ICELIB_DEFINE_H
-#define ICELIB_DEFINE_H
+#ifndef ICELIB_ICELIB_CONFIG_H
+#define ICELIB_ICELIB_CONFIG_H
 
 #define ICELIB_RANDOM_SEGMENT_LENGTH    (32 / 6)
 
@@ -36,5 +36,11 @@
 
 #define ICELIB_FAIL_AFTER_MS                5000 /*5 sec*/
 
+#define ICE_MAX_UFRAG_LENGTH                (256 + 1) /* zero terminated */
+#define ICE_MAX_PASSWD_LENGTH               (256 + 1) /* zero terminated */
+#define ICE_MAX_CANDIDATES                  32
+#define ICE_MAX_FOUNDATION_LENGTH           (32 + 1)  /* zero terminated */
+#define ICE_MAX_MEDIALINES                  20
+#define ICE_MAX_COMPONENTS                  2
 
-#endif
+#endif //ICELIB_ICELIB_CONFIG_H
diff --git a/include/icelibtypes.h b/include/icelibtypes.h
index 1802fe5..37adc73 100644
--- a/include/icelibtypes.h
+++ b/include/icelibtypes.h
@@ -5,7 +5,6 @@
 #ifndef ICELIBTYPES_H
 #define ICELIBTYPES_H
 
-#include "icelib_defines.h"
 #include "stunlib.h"
 
 #include <stdbool.h>
@@ -20,14 +19,11 @@ extern "C" {
 #include <stdbool.h>
 #endif
 
-
-#define ICE_MAX_UFRAG_LENGTH                (256 + 1) /* zero terminated */
-#define ICE_MAX_PASSWD_LENGTH               (256 + 1) /* zero terminated */
-#define ICE_MAX_CANDIDATES                  32
-#define ICE_MAX_FOUNDATION_LENGTH           (32 + 1)  /* zero terminated */
-#define ICE_MAX_MEDIALINES                  20
-#define ICE_MAX_COMPONENTS                  2
-
+#ifdef ICELIB_CUSTOM_CONFIG
+#include ICELIB_CUSTOM_CONFIG
+#else
+#include "icelib_config.h"
+#endif
 
 /* -----------------------------------------------------------------------------
  * */