diff --git a/nsi/Makefile.in b/nsi/Makefile.in
index 5ce79f0..b0d7d8c 100644
--- a/nsi/Makefile.in
+++ b/nsi/Makefile.in
@@ -65,7 +65,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
 	sdk.nsi \
 	uninstall-$(HOST_CPU).nsi \
 	oninit-$(HOST_CPU).nsi \
-	$(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi )
+	$(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \
+	$(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )
 
 	@rm -f $@
 	@cat header-$(HOST_CPU).nsi		> 	$@
@@ -74,6 +75,7 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
 	# Install plugins
 
 	@cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN).nsi )	>> $@
+	@cat $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )	>> $@
 
 	# Finalize
 
diff --git a/nsi/header-i686-no-gtk.nsi.in b/nsi/header-i686-no-gtk.nsi.in
index 8258c51..5f3de80 100644
--- a/nsi/header-i686-no-gtk.nsi.in
+++ b/nsi/header-i686-no-gtk.nsi.in
@@ -9,9 +9,9 @@ XPStyle on
 installDir $PROGRAMFILES\@PACKAGE@
 
 #define the installer icon
-!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
-!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
-icon "src\pw3270\@PACKAGE@.ico"
+!define MUI_ICON "..\src\pw3270\@PACKAGE@.ico"
+!define MUI_UNICON "..\src\pw3270\@PACKAGE@.ico"
+icon "..\src\pw3270\@PACKAGE@.ico"
 
 # Get installation folder from registry if available
 InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
@@ -29,7 +29,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
 
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
diff --git a/nsi/header-i686.nsi.in b/nsi/header-i686.nsi.in
index 7bc5500..158a772 100644
--- a/nsi/header-i686.nsi.in
+++ b/nsi/header-i686.nsi.in
@@ -9,9 +9,9 @@ XPStyle on
 installDir $PROGRAMFILES\@PACKAGE@
 
 #define the installer icon
-!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
-!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
-icon "src\pw3270\@PACKAGE@.ico"
+!define MUI_ICON "..\src\pw3270\@PACKAGE@.ico"
+!define MUI_UNICON "..\src\pw3270\@PACKAGE@.ico"
+icon "..\src\pw3270\@PACKAGE@.ico"
 
 # Get installation folder from registry if available
 InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
@@ -29,7 +29,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
 
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
diff --git a/nsi/header-x86_64-no-gtk.nsi.in b/nsi/header-x86_64-no-gtk.nsi.in
index 342fc23..999da21 100644
--- a/nsi/header-x86_64-no-gtk.nsi.in
+++ b/nsi/header-x86_64-no-gtk.nsi.in
@@ -9,9 +9,9 @@ XPStyle on
 installDir "$PROGRAMFILES64\pw3270"
 
 #define the installer icon
-!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
-!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
-icon "src\pw3270\@PACKAGE@.ico"
+!define MUI_ICON "..\src\pw3270\@PACKAGE@.ico"
+!define MUI_UNICON "..\src\pw3270\@PACKAGE@.ico"
+icon "..\src\pw3270\@PACKAGE@.ico"
 
 # Get installation folder from registry if available
 InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
@@ -29,7 +29,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
 
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
diff --git a/nsi/header-x86_64.nsi.in b/nsi/header-x86_64.nsi.in
index d29ae1a..c883c6c 100644
--- a/nsi/header-x86_64.nsi.in
+++ b/nsi/header-x86_64.nsi.in
@@ -9,9 +9,9 @@ XPStyle on
 installDir "$PROGRAMFILES64\pw3270"
 
 #define the installer icon
-!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
-!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
-icon "src\pw3270\@PACKAGE@.ico"
+!define MUI_ICON "..\src\pw3270\@PACKAGE@.ico"
+!define MUI_UNICON "..\src\pw3270\@PACKAGE@.ico"
+icon "..\src\pw3270\@PACKAGE@.ico"
 
 # Get installation folder from registry if available
 InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
@@ -29,7 +29,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
 
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
diff --git a/nsi/hllapi.nsi.in b/nsi/hllapi.nsi.in
index edbd9a8..efd9aaf 100644
--- a/nsi/hllapi.nsi.in
+++ b/nsi/hllapi.nsi.in
@@ -2,8 +2,8 @@
 			setOutPath $INSTDIR
 
 			CreateDirectory "$INSTDIR\plugins"
-			file "/oname=$INSTDIR\plugins\hllapi.dll"	".bin\Release\plugins\hllapi.dll"
-			file "/oname=$SYSDIR\libhllapi.dll"			".bin\Release\hllapi.dll.@PACKAGE_VERSION@"
+			file "/oname=$INSTDIR\plugins\hllapi.dll"	"..\.bin\Release\plugins\hllapi.dll"
+			file "/oname=$SYSDIR\libhllapi.dll"			"..\.bin\Release\hllapi.dll.@PACKAGE_VERSION@"
 
 		sectionEnd
 
diff --git a/nsi/java-extension.nsi b/nsi/java-extension.nsi
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/nsi/java-extension.nsi
diff --git a/nsi/main-begin-i686.nsi.in b/nsi/main-begin-i686.nsi.in
index 5ef2c86..d2422d0 100644
--- a/nsi/main-begin-i686.nsi.in
+++ b/nsi/main-begin-i686.nsi.in
@@ -11,20 +11,20 @@ SubSection "@PACKAGE@" SecMain
 		createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
 
 		# Binary files
-		file "/oname=$INSTDIR\@PACKAGE@.exe"	".bin\Release\@PACKAGE@.exe"
-		file "/oname=$INSTDIR\@PACKAGE@.ico"	"src\pw3270\@PACKAGE@.ico"
-		file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@"	".bin\Release\lib3270.dll.@PACKAGE_VERSION@"
-		file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@"		".bin\Release\pw3270.dll.@PACKAGE_VERSION@"
+		file "/oname=$INSTDIR\@PACKAGE@.exe"					"..\.bin\Release\@PACKAGE@.exe"
+		file "/oname=$INSTDIR\@PACKAGE@.ico"					"..\src\pw3270\@PACKAGE@.ico"
+		file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@"	"..\.bin\Release\lib3270.dll.@PACKAGE_VERSION@"
+		file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@"		"..\.bin\Release\pw3270.dll.@PACKAGE_VERSION@"
 
 		# Configuration files
-		file "/oname=$INSTDIR\@PACKAGE@-logo.png"	"src\pw3270\@PACKAGE@-logo.png"
-		file "/oname=$INSTDIR\@PACKAGE@.png"		"src\pw3270\@PACKAGE@.png"
-		file "/oname=$INSTDIR\colors.conf"		"colors.conf"
+		file "/oname=$INSTDIR\@PACKAGE@-logo.png"				"..\src\pw3270\@PACKAGE@-logo.png"
+		file "/oname=$INSTDIR\@PACKAGE@.png"					"..\src\pw3270\@PACKAGE@.png"
+		file "/oname=$INSTDIR\colors.conf"						"..\colors.conf"
 
 		# Documentation files
-		file "/oname=$INSTDIR\ChangeLog"		"ChangeLog"
-		file "/oname=$INSTDIR\AUTHORS"			"AUTHORS"
-		file "/oname=$INSTDIR\LICENSE"			"LICENSE"
+		file "/oname=$INSTDIR\ChangeLog"						"..\ChangeLog"
+		file "/oname=$INSTDIR\AUTHORS"							"..\AUTHORS"
+		file "/oname=$INSTDIR\LICENSE"							"..\LICENSE"
 
 		# Misc folders
 		CreateDirectory "$INSTDIR\certs"
@@ -33,11 +33,11 @@ SubSection "@PACKAGE@" SecMain
 		# UI definition files
 		CreateDirectory "$INSTDIR\ui"
 
-		file "/oname=$INSTDIR\ui\00default.xml" 	"ui\00default.xml"
+		file "/oname=$INSTDIR\ui\00default.xml" 				"..\ui\00default.xml"
 
 		# Locale files
 		CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
-		file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
+		file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
 
 		# Save DataDir
 		WriteRegStr HKLM "Software\@PACKAGE@" "datadir" "$INSTDIR"
diff --git a/nsi/main-begin-x86_64.nsi.in b/nsi/main-begin-x86_64.nsi.in
index b756f64..e6199e0 100644
--- a/nsi/main-begin-x86_64.nsi.in
+++ b/nsi/main-begin-x86_64.nsi.in
@@ -14,20 +14,20 @@ SubSection "@PACKAGE@" SecMain
 		createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
 
 		# Binary files
-		file "/oname=$INSTDIR\@PACKAGE@.exe"	".bin\Release\@PACKAGE@.exe"
-		file "/oname=$INSTDIR\@PACKAGE@.ico"	"src\pw3270\@PACKAGE@.ico"
-		file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@"	".bin\Release\lib3270.dll.@PACKAGE_VERSION@"
-		file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@"		".bin\Release\pw3270.dll.@PACKAGE_VERSION@"
+		file "/oname=$INSTDIR\@PACKAGE@.exe"					"..\.bin\Release\@PACKAGE@.exe"
+		file "/oname=$INSTDIR\@PACKAGE@.ico"					"..\src\pw3270\@PACKAGE@.ico"
+		file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@"	"..\.bin\Release\lib3270.dll.@PACKAGE_VERSION@"
+		file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@"		"..\.bin\Release\pw3270.dll.@PACKAGE_VERSION@"
 
 		# Configuration files
-		file "/oname=$INSTDIR\@PACKAGE@-logo.png"	"src\pw3270\@PACKAGE@-logo.png"
-		file "/oname=$INSTDIR\@PACKAGE@.png"		"src\pw3270\@PACKAGE@.png"
-		file "/oname=$INSTDIR\colors.conf"		"colors.conf"
+		file "/oname=$INSTDIR\@PACKAGE@-logo.png"	"..\src\pw3270\@PACKAGE@-logo.png"
+		file "/oname=$INSTDIR\@PACKAGE@.png"		"..\src\pw3270\@PACKAGE@.png"
+		file "/oname=$INSTDIR\colors.conf"			"..\colors.conf"
 
 		# Documentation files
-		file "/oname=$INSTDIR\ChangeLog"		"ChangeLog"
-		file "/oname=$INSTDIR\AUTHORS"			"AUTHORS"
-		file "/oname=$INSTDIR\LICENSE"			"LICENSE"
+		file "/oname=$INSTDIR\ChangeLog"			"..\ChangeLog"
+		file "/oname=$INSTDIR\AUTHORS"				"..\AUTHORS"
+		file "/oname=$INSTDIR\LICENSE"				"..\LICENSE"
 
 		# Misc folders
 		CreateDirectory "$INSTDIR\certs"
@@ -36,11 +36,11 @@ SubSection "@PACKAGE@" SecMain
 		# UI definition files
 		CreateDirectory "$INSTDIR\ui"
 
-		file "/oname=$INSTDIR\ui\00default.xml" 	"ui\00default.xml"
+		file "/oname=$INSTDIR\ui\00default.xml" 	"..\ui\00default.xml"
 
 		# Locale files
 		CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
-		file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
+		file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
 
 		# Save DataDir
 		SetRegView 64
diff --git a/nsi/main-end.nsi.in b/nsi/main-end.nsi.in
index 5f8bb5d..35d6bdc 100644
--- a/nsi/main-end.nsi.in
+++ b/nsi/main-end.nsi.in
@@ -3,20 +3,20 @@
 
 	SubSection "Menus, Keypads & Toolbars" SecMenu
 
-		Section "Keypad" TraceMenu
-			file "/oname=$INSTDIR\ui\10keypad.xml" "ui\10keypad.xml"
+		Section "Keypad" KeypadMenu
+			file "/oname=$INSTDIR\ui\10keypad.xml" "..\ui\10keypad.xml"
 		sectionEnd
 
-		Section "Functions" TraceMenu
-			file "/oname=$INSTDIR\ui\10functions.xml" "ui\10functions.xml"
+		Section "Functions" FunctionsMenu
+			file "/oname=$INSTDIR\ui\10functions.xml" "..\ui\10functions.xml"
 		sectionEnd
 
 		Section /o "View trace Menu" TraceMenu
-			file "/oname=$INSTDIR\ui\98trace.xml" "ui\98trace.xml"
+			file "/oname=$INSTDIR\ui\98trace.xml" "..\ui\98trace.xml"
 		sectionEnd
 
 		Section /o "Application debug" DBGMenu
-			file "/oname=$INSTDIR\ui\99debug.xml" "ui\99debug.xml"
+			file "/oname=$INSTDIR\ui\99debug.xml" "..\ui\99debug.xml"
 		sectionEnd
 
 	SubSectionEnd
diff --git a/nsi/python-extension.nsi b/nsi/python-extension.nsi
new file mode 100644
index 0000000..c48f003
--- /dev/null
+++ b/nsi/python-extension.nsi
@@ -0,0 +1,7 @@
+		Section /o "Python" PythonModule
+
+			setOutPath $INSTDIR
+			file "/oname=$SYSDIR\py3270.dll" "..\.bin\Release\py3270.dll"
+
+		sectionEnd
+
diff --git a/nsi/rexx-extension.nsi b/nsi/rexx-extension.nsi
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/nsi/rexx-extension.nsi
diff --git a/nsi/runtime.nsi.in b/nsi/runtime.nsi.in
index 2b56d15..d93828e 100644
--- a/nsi/runtime.nsi.in
+++ b/nsi/runtime.nsi.in
@@ -2,7 +2,7 @@
 Section "GTK @GTK_MODVERSION@ Runtime" SecGTK
 
 	setOutPath $INSTDIR
-	file /r ".bin\gtkruntime\*.*"
+	file /r "..\.bin\gtkruntime\*.*"
 
 SectionEnd
 
diff --git a/nsi/rx3270.nsi.in b/nsi/rx3270.nsi.in
index d53004d..117ba45 100644
--- a/nsi/rx3270.nsi.in
+++ b/nsi/rx3270.nsi.in
@@ -2,12 +2,12 @@
 
 			setOutPath $INSTDIR
 
-			file "/oname=$INSTDIR\plugins\rxplug.dll" ".bin\Release\plugins\rx3270.dll"
-			file "/oname=$INSTDIR\ui\80rexx.xml" "ui\80rexx.xml"
+			file "/oname=$INSTDIR\plugins\rxplug.dll"	"..\.bin\Release\plugins\rx3270.dll"
+			file "/oname=$INSTDIR\ui\80rexx.xml" 		"..\ui\80rexx.xml"
 
-			file "/oname=$PROGRAMFILES\ooRexx\rx3270.cls" "src\plugins\rx3270\rx3270.cls"
-			file "/oname=$INSTDIR\rx3270.dll.@PACKAGE_VERSION@" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
-			file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
+			file "/oname=$PROGRAMFILES\ooRexx\rx3270.cls"		"..\src\plugins\rx3270\rx3270.cls"
+			file "/oname=$INSTDIR\rx3270.dll.@PACKAGE_VERSION@"	"..\.bin\Release\rx3270.dll.@PACKAGE_VERSION@"
+			file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll"		"..\.bin\Release\rx3270.dll.@PACKAGE_VERSION@"
 
 		sectionEnd
 
diff --git a/nsi/sdk.nsi.in b/nsi/sdk.nsi.in
index f926e9f..08e98d1 100644
--- a/nsi/sdk.nsi.in
+++ b/nsi/sdk.nsi.in
@@ -9,28 +9,28 @@ Section /o "Software Development Kit" SecSDK
 	CreateDirectory "$INSTDIR\sdk\sample\classlib"
 
 	setOutPath $INSTDIR\sdk\include
-	file "src\include\lib3270.h"
-	file "src\include\pw3270.h"
+	file "..\src\include\lib3270.h"
+	file "..\src\include\pw3270.h"
 
 	setOutPath $INSTDIR\sdk\include\pw3270
-	file "src\include\pw3270\class.h"
-	file "src\include\pw3270\hllapi.h"
-	file "src\include\pw3270\ipcpackets.h"
-	file "src\include\pw3270\plugin.h"
-	file "src\include\pw3270\trace.h"
-	file "src\include\pw3270\v3270.h"
+	file "..\src\include\pw3270\class.h"
+	file "..\src\include\pw3270\hllapi.h"
+	file "..\src\include\pw3270\ipcpackets.h"
+	file "..\src\include\pw3270\plugin.h"
+	file "..\src\include\pw3270\trace.h"
+	file "..\src\include\pw3270\v3270.h"
 
 	setOutPath $INSTDIR\sdk\include\lib3270
-	file "src\include\lib3270\config.h"
-	file "src\include\rules.mak"
+	file "..\src\include\lib3270\config.h"
+	file "..\src\include\rules.mak"
 
 	setOutPath $INSTDIR\sdk\sample\connect
-	file "src\sample\Makefile"
-	file "src\sample\connect.c"
+	file "..\src\sample\Makefile"
+	file "..\src\sample\connect.c"
 
 	setOutPath $INSTDIR\sdk\sample\classlib
-	file "src\classlib\*.cc"
-	file "src\include\pw3270\class.h"
+	file "..\src\classlib\*.cc"
+	file "..\src\include\pw3270\class.h"
 
 SectionEnd
 
diff --git a/nsi/uninstall-i686.nsi.in b/nsi/uninstall-i686.nsi.in
index 4ff5332..e3958bc 100644
--- a/nsi/uninstall-i686.nsi.in
+++ b/nsi/uninstall-i686.nsi.in
@@ -32,6 +32,7 @@ section "Uninstall"
 
 	# Delete System libraries
 	delete $SYSDIR\libhllapi.dll
+	delete $SYSDIR\py3270.dll
 
 	# Delete extension libraries
 	delete "$PROGRAMFILES\ooRexx\rx3270.cls"
diff --git a/nsi/uninstall-x86_64.nsi.in b/nsi/uninstall-x86_64.nsi.in
index bb36b44..67318e3 100644
--- a/nsi/uninstall-x86_64.nsi.in
+++ b/nsi/uninstall-x86_64.nsi.in
@@ -34,6 +34,7 @@ section "Uninstall"
 
 	# Delete System libraries
 	delete $SYSDIR\libhllapi.dll
+	delete $SYSDIR\py3270.dll
 
 	# Delete extension libraries
 	delete "$PROGRAMFILES64\ooRexx\rx3270.cls"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index edc21f2..dcba13e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-03 08:25-0200\n"
+"POT-Creation-Date: 2015-11-03 10:19-0200\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
--
libgit2 0.21.2