diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo b/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo
index d596471..43c8129 100755
Binary files a/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo and b/P8000_WDC_Emulator/P8000_WDC_Emulator.atsuo differ
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile b/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile
index c80e68b..d1b7fd6 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/Makefile
@@ -2,9 +2,9 @@ OUTPUT_FILE=P8000_WDC_Emulator
 MCU=	-mmcu=atmega1284p
 
 CC=avr-gcc
-CFLAGS= -I/usr/local/avr/include -funsigned-char -funsigned-bitfields -O1 \
-	-ffunction-sections -fpack-struct -fshort-enums -Wall -Wundef \
-	-Werror -pedantic -pedantic-errors -c  ${MCU}
+CFLAGS= -I/usr/local/avr/include -funsigned-char -funsigned-bitfields \
+	-O1 -ffunction-sections -fpack-struct -fshort-enums -Wall \
+	-Wundef -Werror -pedantic -pedantic-errors ${MCU}
 
 LDFLAGS=-Wl,-Map="${OUTPUT_FILE}.map" -Wl,--start-group -Wl,-lm  \
 	-Wl,--end-group -Wl,--gc-sections ${MCU}
@@ -30,9 +30,14 @@ ${OUTPUT_FILE}: ${OBJS}
 	avr-objcopy -O ihex -R .eeprom -R .fuse -R .lock -R .signature  "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.hex"
 	avr-objcopy -j .eeprom  --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0  --no-change-warnings -O ihex "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.eep" || exit 0
 	avr-objdump -h -S "${OUTPUT_FILE}.elf" > "${OUTPUT_FILE}.lss"
+	avr-objcopy -O srec -R .eeprom -R .fuse -R .lock -R .signature  "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.srec"
 	avr-size "${OUTPUT_FILE}.elf"
 	
 clean:
 	-${RM} ${OBJS}
-	rm -rf "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.a" "${OUTPUT_FILE}.hex" "${OUTPUT_FILE}.lss" "${OUTPUT_FILE}.eep" "${OUTPUT_FILE}.map"
-	
+	rm -rf "${OUTPUT_FILE}.elf" "${OUTPUT_FILE}.a" "${OUTPUT_FILE}.hex" "${OUTPUT_FILE}.lss" "${OUTPUT_FILE}.eep" "${OUTPUT_FILE}.map" "${OUTPUT_FILE}.srec"
+
+format:
+	for file in *.h *.c ; do \
+		uncrustify -l C -c ../uncrustify.cfg --no-backup $$file ;\
+	done
diff --git a/P8000_WDC_Emulator/uncrustify.cfg b/P8000_WDC_Emulator/uncrustify.cfg
index ae813a6..f4e70ff 100755
--- a/P8000_WDC_Emulator/uncrustify.cfg
+++ b/P8000_WDC_Emulator/uncrustify.cfg
@@ -1,3 +1,4 @@
+newlines		= lf
 indent_columns          = 4
 indent_with_tabs        = 0
 indent_switch_case	= 4
@@ -33,7 +34,7 @@ mod_remove_extra_semicolon = true
 
 sp_return_paren		= force	
 sp_sizeof_paren		= remove
-sp_before_sparen	= remove
+sp_before_sparen	= force
 sp_after_sparen		= force
 sp_after_cast		= remove
 sp_inside_braces	= force
@@ -54,6 +55,9 @@ sp_inside_fparen	= force
 sp_paren_brace		= force
 sp_sparen_brace		= force 
 sp_fparen_brace		= force 
+sp_func_call_paren	= add
+sp_func_call_paren_empty = remove
+
 align_struct_init_span	= 0
 align_func_params	= true
 align_var_def_span	= 3