diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fadc6d..a001990 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ include_directories(
 
 if(UNIX)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
 endif(UNIX)
 
 add_subdirectory(src)
diff --git a/include/profiler/profiler.h b/include/profiler/profiler.h
index e6650d0..196e046 100644
--- a/include/profiler/profiler.h
+++ b/include/profiler/profiler.h
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
-/**/
+**/
 
 #ifndef ____PROFILER____H_______
 #define ____PROFILER____H_______
@@ -54,19 +54,13 @@ along with this program.If not, see <http://www.gnu.org/licenses/>.
 #ifdef _WIN32
 #ifdef	_BUILD_PROFILER
 #define  PROFILER_API		__declspec(dllexport)
-#define EXPIMP_TEMPLATE
 #else
 #define  PROFILER_API		__declspec(dllimport)
-#define EXPIMP_TEMPLATE	 extern
 #endif
 #else
 #define  PROFILER_API
-#define EXPIMP_TEMPLATE
 #endif
 
-
-
-
 namespace profiler
 {
 	class Mark;
diff --git a/src/block.cpp b/src/block.cpp
index e321eec..86efa7c 100644
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -14,11 +14,11 @@ const unsigned char MARK_TYPE_BEGIN = 3;
 const unsigned char MARK_TYPE_END = 4;
 
 Mark::Mark(const char* _name, color_t _color) :
-begin(0),
-color(_color),
-thread_id(0),
-name(_name),
-type(0)
+		type(0),
+		color(_color),
+		begin(0),
+		thread_id(0),
+		name(_name)
 {
 	tick(begin);
 	thread_id = std::hash<std::thread::id>()(std::this_thread::get_id());
@@ -32,8 +32,8 @@ void Mark::tick(timestamp_t& stamp)
 }
 
 Block::Block(const char* _name, color_t _color) :
-Mark(_name, _color), 
-end(begin)
+		Mark(_name, _color),
+		end(begin)
 {
 
 }
diff --git a/src/profile_manager.h b/src/profile_manager.h
index a60f4f5..43fee2b 100644
--- a/src/profile_manager.h
+++ b/src/profile_manager.h
@@ -14,7 +14,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.If not, see <http://www.gnu.org/licenses/>.
-/**/
+**/
 
 #ifndef ___PROFILER____MANAGER____H______
 #define ___PROFILER____MANAGER____H______