diff --git a/ToDo b/ToDo
index d2388d9..04a1db1 100644
--- a/ToDo
+++ b/ToDo
@@ -3,13 +3,25 @@ Add all supported devices
 Remove or make optional options that are not always required
 
 Add options, in particular
-  stack location
+  stack location --stack-loc 0x40
+  -mpic14 -mpic16 (?)
   asm  and linker warning options
   include path
   library path
   library list
   ... and probably many more
 
+from forum list: http://www.microchip.com/forums/m669474.aspx
+#7
+- that shows descriptions in the dialog
+- added peephole optimization option
+- changed option name "Location of constants" -> "Optimization of BANKSEL"
+#8
+- now with include path option in dialog
+#13
+I add (preliminary) support a SystemIncludeProvider and SystemDefineProvider to get rid of the language errors (red underlined in the editor).
+
+
 Add script (?) to pass memory and flash usage info to mplabx_ide
 
 Sign package automatically
diff --git a/build/classes/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml b/build/classes/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml
index 21dc70f..a11d45e 100644
--- a/build/classes/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml
+++ b/build/classes/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml
@@ -61,7 +61,7 @@
       <mp:makeRule mp:id="link" mp:target="${FINAL_IMAGE_NAME}" mp:prerequisites="${CURRENT_OBJECT_FILES}" mp:runtimepropertiesclass="org.laczik.toolchainSDCC.CompilerProperties">
             <mp:textEmitter mp:text="${MKDIR} ${FINAL_TARGET_DIR} ${NEWLINE}"/>
             <mp:textEmitter mp:text="${MP_CC} "/>
-            <mp:textEmitter mp:text=" --debug-ralloc -Wl-c -Wl-m "/>
+            <mp:textEmitter mp:text=" -Wl-c -Wl-m "/>
             <mp:optionEmitter mp:idref="sdcc" mp:separator=" "/>
             <mp:textEmitter mp:text=" -m${PROCESSOR_FAMILY}"/>
             <mp:textEmitter mp:text=" -p${PROCESSOR_NAME}"/>
diff --git a/build/classes/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml b/build/classes/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml
index 0ebc914..d9bd66f 100644
--- a/build/classes/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml
+++ b/build/classes/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml
@@ -25,6 +25,7 @@
     <opt:booleanOption opt:id="no-c-code-in-asm"         opt:name="Hide C code from ASM" opt:desc="Hides your ugly and inefficient c-code from the asm file, so you can always blame the compiler :)" opt:trueemission="--no-c-code-in-asm"/>
     <opt:booleanOption opt:id="verbose"                  opt:name="Verbose actions" opt:desc="Shows the various actions the compiler is performing. " opt:trueemission="--verbose"/>
     <opt:booleanOption opt:id="V-show-commands-compiler" opt:name="Verbose commands" opt:desc="Shows the actual commands the compiler is executing." opt:trueemission="-V"/>
+    <opt:stringListOption opt:id="define-macros"         opt:name="Define macros"             opt:emissionseparator=" -D"  opt:emissionprefix="-D" opt:expr="[A-Za-z_][A-Za-z_0-9]*(=.+)?"/>
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic14" opt:name="PIC14 exclusive options">
@@ -33,7 +34,8 @@
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic16" opt:name="PIC16 exclusive options">
-    <opt:enumOption opt:id="pstack-model"               opt:name="Stack-size" opt:desc="Defines the stack model to be used." opt:textdefault="small" opt:emissionprefix="--pstack-model=" opt:emitswhendefault="true">
+    <opt:booleanOption opt:id="debug-ralloc"            opt:name=" Force register allocator to dump *.d ?les with debugging information." opt:desc="output debugging information" opt:trueemission="--debug-ralloc" opt:booldefault="false"/>
+    <opt:enumOption opt:id="pstack-model"               opt:name="Stack-size" opt:desc="Defines the stack model to be used." opt:textdefault="" opt:emissionprefix="--pstack-model=" opt:emitswhendefault="false">
       <opt:selection opt:text="small"                   opt:name="Small" opt:desc="Selects small stack model. 8 bit stack and frame pointers. Supports 256 bytes stack size."/>
       <opt:selection opt:text="large"                   opt:name="Large" opt:desc="Selects large stack model. 16 bit stack and frame pointers. Supports 65536 bytes stack size."/>
     </opt:enumOption>
diff --git a/build/cluster/modules/org-laczik-toolchainSDCC.jar b/build/cluster/modules/org-laczik-toolchainSDCC.jar
index b150d3b..e8abb20 100644
Binary files a/build/cluster/modules/org-laczik-toolchainSDCC.jar and b/build/cluster/modules/org-laczik-toolchainSDCC.jar differ
diff --git a/build/cluster/update_tracking/org-laczik-toolchainSDCC.xml b/build/cluster/update_tracking/org-laczik-toolchainSDCC.xml
index 6daef91..e4c8f8d 100644
--- a/build/cluster/update_tracking/org-laczik-toolchainSDCC.xml
+++ b/build/cluster/update_tracking/org-laczik-toolchainSDCC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><module codename="org.laczik.toolchainSDCC/1">
-    <module_version install_time="1421101839579" last="true" origin="installer" specification_version="1.0.4">
+    <module_version install_time="1421103463466" last="true" origin="installer" specification_version="1.0.5">
         <file crc="1529467185" name="config/Modules/org-laczik-toolchainSDCC.xml"/>
-        <file crc="503320611" name="modules/org-laczik-toolchainSDCC.jar"/>
+        <file crc="56880376" name="modules/org-laczik-toolchainSDCC.jar"/>
     </module_version>
 </module>
diff --git a/build/org-laczik-toolchainSDCC.nbm b/build/org-laczik-toolchainSDCC.nbm
index 6320cb9..9bb7392 100644
Binary files a/build/org-laczik-toolchainSDCC.nbm and b/build/org-laczik-toolchainSDCC.nbm differ
diff --git a/build/public-package-jars/com-microchip-mplab-libs-crownking.jar b/build/public-package-jars/com-microchip-mplab-libs-crownking.jar
index ef7ecd6..fb120ec 100644
Binary files a/build/public-package-jars/com-microchip-mplab-libs-crownking.jar and b/build/public-package-jars/com-microchip-mplab-libs-crownking.jar differ
diff --git a/build/public-package-jars/com-microchip-mplab-nbide-embedded-makeproject.jar b/build/public-package-jars/com-microchip-mplab-nbide-embedded-makeproject.jar
index d9abc1e..ffb3375 100644
Binary files a/build/public-package-jars/com-microchip-mplab-nbide-embedded-makeproject.jar and b/build/public-package-jars/com-microchip-mplab-nbide-embedded-makeproject.jar differ
diff --git a/build/public-package-jars/com-microchip-mplab-nbide-embedded.jar b/build/public-package-jars/com-microchip-mplab-nbide-embedded.jar
index 00d9eb9..eb9c2d0 100644
Binary files a/build/public-package-jars/com-microchip-mplab-nbide-embedded.jar and b/build/public-package-jars/com-microchip-mplab-nbide-embedded.jar differ
diff --git a/build/public-package-jars/org-netbeans-modules-projectapi.jar b/build/public-package-jars/org-netbeans-modules-projectapi.jar
index 4cd72cc..3b003ff 100644
Binary files a/build/public-package-jars/org-netbeans-modules-projectapi.jar and b/build/public-package-jars/org-netbeans-modules-projectapi.jar differ
diff --git a/build/public-package-jars/org-openide-util.jar b/build/public-package-jars/org-openide-util.jar
index f7ac928..2396947 100644
Binary files a/build/public-package-jars/org-openide-util.jar and b/build/public-package-jars/org-openide-util.jar differ
diff --git a/manifest.mf b/manifest.mf
index 1c9b44d..48ac57c 100644
--- a/manifest.mf
+++ b/manifest.mf
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.laczik.toolchainSDCC/1
 OpenIDE-Module-Layer: org/laczik/toolchainSDCC/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/laczik/toolchainSDCC/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0.4
+OpenIDE-Module-Specification-Version: 1.0.5
 
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index 07d565a..0a5b006 100644
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/README</file>
         <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/ToDo</file>
         <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml</file>
         <file>file:/home/laczik/programming/NetBeansProjects/toolchainSDCC/src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml</file>
diff --git a/src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml b/src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml
index 21dc70f..a11d45e 100644
--- a/src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml
+++ b/src/org/laczik/toolchainSDCC/sdcc.languageToolchain.xml
@@ -61,7 +61,7 @@
       <mp:makeRule mp:id="link" mp:target="${FINAL_IMAGE_NAME}" mp:prerequisites="${CURRENT_OBJECT_FILES}" mp:runtimepropertiesclass="org.laczik.toolchainSDCC.CompilerProperties">
             <mp:textEmitter mp:text="${MKDIR} ${FINAL_TARGET_DIR} ${NEWLINE}"/>
             <mp:textEmitter mp:text="${MP_CC} "/>
-            <mp:textEmitter mp:text=" --debug-ralloc -Wl-c -Wl-m "/>
+            <mp:textEmitter mp:text=" -Wl-c -Wl-m "/>
             <mp:optionEmitter mp:idref="sdcc" mp:separator=" "/>
             <mp:textEmitter mp:text=" -m${PROCESSOR_FAMILY}"/>
             <mp:textEmitter mp:text=" -p${PROCESSOR_NAME}"/>
diff --git a/src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml b/src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml
index 0ebc914..d9bd66f 100644
--- a/src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml
+++ b/src/org/laczik/toolchainSDCC/sdcc.optionLanguage.xml
@@ -25,6 +25,7 @@
     <opt:booleanOption opt:id="no-c-code-in-asm"         opt:name="Hide C code from ASM" opt:desc="Hides your ugly and inefficient c-code from the asm file, so you can always blame the compiler :)" opt:trueemission="--no-c-code-in-asm"/>
     <opt:booleanOption opt:id="verbose"                  opt:name="Verbose actions" opt:desc="Shows the various actions the compiler is performing. " opt:trueemission="--verbose"/>
     <opt:booleanOption opt:id="V-show-commands-compiler" opt:name="Verbose commands" opt:desc="Shows the actual commands the compiler is executing." opt:trueemission="-V"/>
+    <opt:stringListOption opt:id="define-macros"         opt:name="Define macros"             opt:emissionseparator=" -D"  opt:emissionprefix="-D" opt:expr="[A-Za-z_][A-Za-z_0-9]*(=.+)?"/>
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic14" opt:name="PIC14 exclusive options">
@@ -33,7 +34,8 @@
   </opt:optionCategory>
 
   <opt:optionCategory opt:id="pic16" opt:name="PIC16 exclusive options">
-    <opt:enumOption opt:id="pstack-model"               opt:name="Stack-size" opt:desc="Defines the stack model to be used." opt:textdefault="small" opt:emissionprefix="--pstack-model=" opt:emitswhendefault="true">
+    <opt:booleanOption opt:id="debug-ralloc"            opt:name=" Force register allocator to dump *.d ?les with debugging information." opt:desc="output debugging information" opt:trueemission="--debug-ralloc" opt:booldefault="false"/>
+    <opt:enumOption opt:id="pstack-model"               opt:name="Stack-size" opt:desc="Defines the stack model to be used." opt:textdefault="" opt:emissionprefix="--pstack-model=" opt:emitswhendefault="false">
       <opt:selection opt:text="small"                   opt:name="Small" opt:desc="Selects small stack model. 8 bit stack and frame pointers. Supports 256 bytes stack size."/>
       <opt:selection opt:text="large"                   opt:name="Large" opt:desc="Selects large stack model. 16 bit stack and frame pointers. Supports 65536 bytes stack size."/>
     </opt:enumOption>