diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..bc745a6
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+CC=gcc
+CFLAGS=-c -Wall -std=c99 -O3
+LDFLAGS=
+SOURCES=src/main.c src/Scanner.c src/Generator.c 
+OBJECTS=$(SOURCES:.c=.o)
+EXEC=pl0syntaxcolor
+
+all: $(SOURCES) $(EXEC)
+
+$(EXEC): $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
+
+.c.o:
+	$(CC) $(CFLAGS) $< -o $@
+	
diff --git a/src/Generator.c b/src/Generator.c
index 68867ea..e35380a 100644
--- a/src/Generator.c
+++ b/src/Generator.c
@@ -1,6 +1,6 @@
 #include <fcntl.h>
-#include "Scanner.h"
-#include "Generator.h"
+#include "../include/Scanner.h"
+#include "../include/Generator.h"
 #include <stdlib.h>
 
 char* bottom(){
@@ -12,7 +12,8 @@ char* header(){
 }
 
 char* convertTokenToHtml(struct Token* token,char **colorTable){
-  
+  if(token->type == whitespace)
+	  return token->buffer;
   char *buffer =(char*)malloc(sizeof(char)*2048);
   if(buffer == NULL){
       perror("problem with malloc:");
@@ -34,7 +35,6 @@ void converToHtml(char *path,char **colorTable)
    appendTofile(header(),f);
    while(token.type != eof){
        token = scan(&file);
-       printf("%s",token.buffer);
        appendTofile(convertTokenToHtml(&token,colorTable),f); 
    }
    appendTofile(bottom(),f);
diff --git a/src/Generator.o b/src/Generator.o
new file mode 100644
index 0000000..40782ab
Binary files /dev/null and b/src/Generator.o differ
diff --git a/src/Scanner.c b/src/Scanner.c
index 1eac081..5e8be2a 100644
--- a/src/Scanner.c
+++ b/src/Scanner.c
@@ -1,10 +1,10 @@
 #include <fcntl.h>
 #include <X11/Xlib.h>
-#include "Scanner.h"
+#include "../include/Scanner.h"
 #include "errno.h"
 #include "stdlib.h"
 #include <ctype.h>
-
+#include <stdbool.h>
 
 
 
diff --git a/src/Scanner.o b/src/Scanner.o
new file mode 100644
index 0000000..04cc37f
Binary files /dev/null and b/src/Scanner.o differ
diff --git a/src/main.c b/src/main.c
index 56efd2c..3e8c2d6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 #include <fcntl.h>
 
-#include "Generator.h"
+#include "../include/Generator.h"
 #include "errno.h"
 #include "stdlib.h"
 #include <stdio.h>
@@ -16,4 +16,4 @@ int main(){
    converToHtml("./test.txt",colorTable);
    
    return 0; 
-}
\ No newline at end of file
+}
diff --git a/src/main.o b/src/main.o
new file mode 100644
index 0000000..063a40c
Binary files /dev/null and b/src/main.o differ