diff --git a/benchmarkPackage/CMakeLists.txt b/benchmarkPackage/CMakeLists.txt
index bd0b3424..b32d3383 100644
--- a/benchmarkPackage/CMakeLists.txt
+++ b/benchmarkPackage/CMakeLists.txt
@@ -45,11 +45,12 @@ set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
 
 if( MSVC_IDE )
     set( Bolt_BUILD64 ${CMAKE_CL_64} )
-#    set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
+    set_property( GLOBAL PROPERTY USE_FOLDERS TRUE )
 else()
-#    option( Bolt_BUILD64 "Build a 64-bit product" ON )
- set( CMAKE_BUILD_TYPE ${BOLT_BUILD_TYPE} CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE )   
+    option( Bolt_BUILD64 "Build a 64-bit product" ON )
+    set( CMAKE_BUILD_TYPE ${BOLT_BUILD_TYPE} CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE )   
 endif()
+
  message( STATUS "64bit build :" ${Bolt_BUILD64} )
  message( STATUS "Build Type R/D:" ${CMAKE_BUILD_TYPE} )
 
@@ -104,13 +105,23 @@ elseif( (C_COMPILER_NAME STREQUAL "gcc") OR (CMAKE_COMPILER_IS_GNUCXX GREATER 0)
     if( Bolt_BUILD64 )
         set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" )
         set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" )
-        set( CMAKE_EXE_LINKER_FLAGS " -m64 ${CMAKE_EXE_LINKER_FLAGS}" )
-        set( CMAKE_SHARED_LINKER_FLAGS "-lpthread -m64 ${CMAKE_SHARED_LINKER_FLAGS}" )
+        execute_process(COMMAND lsb_release -irc 
+	OUTPUT_VARIABLE suse-ubuntu)
+	STRING(FIND $(suse_ubuntu) "Ubuntu" pos)
+	SET(com -1)
+	if($(pos) EQUAL com)
+		set( CMAKE_SHARED_LINKER_FLAGS "-m64 ${CMAKE_SHARED_LINKER_FLAGS}" )
+		set( CMAKE_EXE_LINKER_FLAGS "-lpthread -m64 ${CMAKE_EXE_LINKER_FLAGS}" )
+	else()
+		set( CMAKE_EXE_LINKER_FLAGS " -m64 ${CMAKE_EXE_LINKER_FLAGS}" )
+		set( CMAKE_SHARED_LINKER_FLAGS "-lpthread -m64 ${CMAKE_SHARED_LINKER_FLAGS}" )
+	endif()
+
     else( )
-        set( CMAKE_CXX_FLAGS "-m32 -msse2  ${CMAKE_CXX_FLAGS}" )
+        set( CMAKE_CXX_FLAGS "-m32 -msse2 ${CMAKE_CXX_FLAGS}" )
         set( CMAKE_C_FLAGS "-m32 -msse2 ${CMAKE_C_FLAGS}" )
-	set( CMAKE_SHARED_LINKER_FLAGS "-lpthread -m32 ${CMAKE_SHARED_LINKER_FLAGS}" )
-	set( CMAKE_EXE_LINKER_FLAGS " -m32 ${CMAKE_EXE_LINKER_FLAGS}" )
+        set( CMAKE_SHARED_LINKER_FLAGS "-m32 ${CMAKE_SHARED_LINKER_FLAGS}" )
+        set( CMAKE_EXE_LINKER_FLAGS "-lpthread -m32 ${CMAKE_EXE_LINKER_FLAGS}" )
     endif( )
 else( )
     message( AUTHOR_WARNING "Compiler not recognized.  Using default flags." )
diff --git a/benchmarkPackage/FindTBB.cmake b/benchmarkPackage/FindTBB.cmake
index 1af08876..b13a2d15 100644
--- a/benchmarkPackage/FindTBB.cmake
+++ b/benchmarkPackage/FindTBB.cmake
@@ -90,15 +90,28 @@ else ( )
     message ("TBB_INCLUDE_DIRS: " ${TBB_INCLUDE_DIRS} )
     
     #Find TBB Libraries
-    set (_TBB_LIBRARY_DIR ${TBB_ROOT}/lib/${TBB_ARCH_PLATFORM} )
-    find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
+	if ( MSVC )
+		set (_TBB_LIBRARY_DIR ${TBB_ROOT}/lib/${TBB_ARCH_PLATFORM} )
+		find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
                 PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-    find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
+		find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
                 PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-    find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
+		find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
                 PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
-    find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
-                PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)        
+		find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}/${TBB_COMPILER}
+                PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)   
+	else( )
+		set (_TBB_LIBRARY_DIR ${TBB_ROOT}/lib/${TBB_ARCH_PLATFORM}/gcc4.4 )
+		find_library(TBB_LIBRARY ${_TBB_LIB_NAME} HINTS ${_TBB_LIBRARY_DIR}
+                PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
+		find_library(TBB_MALLOC_LIBRARY ${_TBB_LIB_MALLOC_NAME} HINTS ${_TBB_LIBRARY_DIR}
+                PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
+		find_library(TBB_LIBRARY_DEBUG ${_TBB_LIB_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
+                PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)
+		find_library(TBB_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_MALLOC_DEBUG_NAME} HINTS ${_TBB_LIBRARY_DIR}
+                PATHS ENV LIBRARY_PATH ENV LD_LIBRARY_PATH)   
+	endif( )	
+         
 
     message ("TBB_LIBRARY:" ${TBB_LIBRARY})
     message ("TBB_MALLOC_LIBRARY:" ${TBB_MALLOC_LIBRARY})