diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..198a7c45
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,17 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 208e8f63..10e641c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,8 +22,9 @@ kickstarts/*.rom
 *.dat
 Amiberry/VisualGDB/Debug/Amiberry
 Amiberry/VisualGDB/Release/Amiberry
+*.sqlite
+Amiberry/VisualGDB/Release-rpi2/Amiberry
 *.ipch
-*.TMP
-VisualGDB/VisualGDB/Release/Amiberry
-VisualGDB/VisualGDB/Debug/Amiberry
-*.npa00-a6b8830a
+*.db-shm
+*.db-wal
+*.TMP
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 85dd42b2..2a8d4895 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ else ifeq ($(PLATFORM),rpi1)
 	CPU_FLAGS += -std=gnu++14 -march=armv6zk -mfpu=vfp -mfloat-abi=hard
 endif
 
-NAME   = uae4arm
+NAME   = amiberry-sdl2
 RM     = rm -f
 CXX    = g++
 STRIP  = strip
@@ -45,8 +45,7 @@ LDFLAGS += -lSDL2_ttf -lguisan -L/opt/vc/lib -Lsrc/guisan
 LDFLAGS += -Wl,-gc-sections,-rpath,/usr/local/lib
 
 ifndef DEBUG
-MORE_CFLAGS += -Ofast -fomit-frame-pointer
-MORE_CFLAGS += -finline -fno-builtin
+MORE_CFLAGS += -Ofast 
 else
 MORE_CFLAGS += -g -DDEBUG -Wl,--export-dynamic