diff --git a/CHANGELOG b/CHANGELOG
index 6a7e803..ef6dd95 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.1.3
+=============
+Renamed samples to examples.
+Using CMake now.
+
 Version 0.1.2
 =============
 Added pipe support - now you can pipe output from other programs into the interpreter!
@@ -8,4 +13,4 @@ Tweaked output messages
 
 Version 0.1.0
 =============
-First stable release
\ No newline at end of file
+First stable release
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..2af7c80
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 2.6)
+
+# Project name
+project(brainfuck C)
+
+set (brainfuck_VERSION_MAJOR 0)
+set (brainfuck_VERSION_MINOR 1)
+set (brainfuck_VERSION_PATCH 3)
+
+add_definitions("-Wall")
+add_executable(brainfuck src/brainfuck_shell.c src/brainfuck.c src/brainfuck.h)
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c39800a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Brainfuck Makefile
-SRC = $(shell pwd)/src
-BIN = $(shell pwd)/bin
-CC = gcc
-CCFLAGS = -Wall
-
-
-all:
-	@echo "Building"
-	mkdir -p bin
-	$(CC) $(CCFLAGS) -o $(BIN)/brainfuck $(SRC)/*
-clean:
-	@echo "Cleaning"
-	rm -f src/*.o
-	rm -r bin/
-install:
-	@echo "Installing" 
-	cp $(BIN)/brainfuck /usr/local/bin/brainfuck
-	cp man/brainfuck.1 /usr/local/share/man/man1/brainfuck.1
-uninstall:
-	@echo "Uninstalling"
-	rm -f /usr/local/bin/brainfuck
-	rm -f /usr/local/share/man/man1/brainfuck.1
diff --git a/samples/ROT13.bf b/examples/ROT13.bf
similarity index 100%
rename from samples/ROT13.bf
rename to examples/ROT13.bf
diff --git a/samples/hello_world.bf b/examples/hello_world.bf
similarity index 100%
rename from samples/hello_world.bf
rename to examples/hello_world.bf
diff --git a/samples/squares.bf b/examples/squares.bf
similarity index 100%
rename from samples/squares.bf
rename to examples/squares.bf
diff --git a/samples/test.bf b/examples/test.bf
similarity index 100%
rename from samples/test.bf
rename to examples/test.bf