diff --git a/charset.c b/charset.c
index ff7d008..28d3ff2 100644
--- a/charset.c
+++ b/charset.c
@@ -178,8 +178,7 @@ wide_resource_init(char *csname)
 /*
  * Change character sets.
  */
-enum cs_result
-charset_init(char *csname)
+enum cs_result charset_init(H3270 *session, char *csname)
 {
 	char *cs, *ftcs;
 	enum cs_result rc;
@@ -207,17 +206,7 @@ charset_init(char *csname)
 		charset_defaults();
 		set_cgcsgids(CN);
 		set_charset_name(CN);
-		set_display_charset("iso8859-1");
-
-/*
-#if defined(_WIN32) || defined(LIB3270)
-		set_display_charset("iso8859-1");
-#elif defined(X3270_DISPLAY) || (defined(C3270) && !defined(_WIN32))
-		(void) screen_new_display_charsets(default_display_charset,"us");
-#else
-		utf8_set_display_charsets(default_display_charset, "us");
-#endif
-*/
+		set_display_charset(session, "ISO-8859-1");
 
 		return CS_OKAY;
 	}
@@ -373,8 +362,7 @@ set_charset_name(char *csname)
 }
 
 /* Define a charset from resources. */
-static enum cs_result
-resource_charset(char *csname, char *cs, char *ftcs)
+static enum cs_result resource_charset(char *csname, char *cs, char *ftcs)
 {
 	enum cs_result rc;
 	int ne = 0;
@@ -454,10 +442,12 @@ resource_charset(char *csname, char *cs, char *ftcs)
 #if defined(_WIN32) /*[*/
        /* See about changing the console output code page. */
        dcs = get_fresource("%s.%s", ResDisplayCharset, csname);
-       if (dcs != NULL) {
+       if (dcs != NULL)
+	   {
 	       set_display_charset(dcs);
-       } else {
-	       set_display_charset("iso8859-1");
+       } else
+       {
+	       set_display_charset("ISO-8859-1");
        }
 #endif /*]*/
 
@@ -744,10 +734,13 @@ check_charset(void)
 }
 #endif /*]*/
 
-/* Return the current character set name. */
-char *
-get_charset_name(void)
+void set_display_charset(H3270 *session, char *dcs)
+{
+	session->charset = strdup(dcs);
+}
+
+LIB3270_EXPORT const char * lib3270_get_charset(H3270 *session)
 {
-	return (charset_name != CN)? charset_name:
-	    ((appres.charset != CN)? appres.charset: "us");
+	CHECK_SESSION_HANDLE(session);
+	return session->charset ? session->charset : "ISO-8859-1";
 }
diff --git a/charsetc.h b/charsetc.h
index 002f912..d555a46 100644
--- a/charsetc.h
+++ b/charsetc.h
@@ -35,7 +35,8 @@ LIB3270_INTERNAL char *default_display_charset;
 
 enum cs_result { CS_OKAY, CS_NOTFOUND, CS_BAD, CS_PREREQ, CS_ILLEGAL };
 
-LIB3270_INTERNAL enum cs_result charset_init(char *csname);
-LIB3270_INTERNAL char *get_charset_name(void);
-LIB3270_INTERNAL void set_display_charset(char *dcs);
+LIB3270_INTERNAL enum cs_result charset_init(H3270 *session, char *csname);
+// LIB3270_INTERNAL char *get_charset_name(void);
+
+LIB3270_INTERNAL void set_display_charset(H3270 *session, char *dcs);
 
diff --git a/glue.c b/glue.c
index 5de2831..7e17b5f 100644
--- a/glue.c
+++ b/glue.c
@@ -138,6 +138,13 @@ void lib3270_session_free(H3270 *h)
 		}
 	}
 
+	// Release memory
+	if(h->charset)
+	{
+		free(h->charset);
+		h->charset = NULL;
+	}
+
 }
 
 static void update_char(H3270 *session, int addr, unsigned char chr, unsigned short attr, unsigned char cursor)
@@ -259,10 +266,10 @@ H3270 * lib3270_session_new(const char *model)
 		return NULL;
 
 	Trace("Charset: %s",appres.charset);
-	if (charset_init(appres.charset) != CS_OKAY)
+	if (charset_init(hSession,appres.charset) != CS_OKAY)
 	{
-		Warning(NULL, _( "Cannot find charset \"%s\", using defaults" ), appres.charset);
-		(void) charset_init(CN);
+		Warning(hSession, _( "Cannot find charset \"%s\", using defaults" ), appres.charset);
+		(void) charset_init(hSession,CN);
 	}
 
 	kybd_init();
diff --git a/macros.c b/macros.c
index af8bdd4..a757472 100644
--- a/macros.c
+++ b/macros.c
@@ -99,7 +99,7 @@
 
  LIB3270_MACRO( encoding )
  {
- 	return strdup("ISO-8859-1");
+ 	return strdup(lib3270_get_charset(hSession));
  }
 
  LIB3270_MACRO( get )
diff --git a/printer.c b/printer.c
index f1e6f81..1396aff 100644
--- a/printer.c
+++ b/printer.c
@@ -314,7 +314,7 @@ printer_start(const char *lu)
 		    "for pr3287\n");
 		(void) fprintf(f, "# Created by %s\n", build);
 		(void) fprintf(f, "# Chararter set is '%s'\n",
-		    get_charset_name());
+		    lib3270_get_charset(&h3270));
 		(void) fprintf(f, "cgcsgid=0x%08lx\n", cgcsgid);
 #if defined(X3270_DBCS) /*[*/
 		if (dbcs) {
diff --git a/screen.c b/screen.c
index d7cae08..4541e77 100644
--- a/screen.c
+++ b/screen.c
@@ -91,11 +91,6 @@ static void status_connect(H3270 *session, int ignored, void *dunno);
 static void status_3270_mode(H3270 *session, int ignored, void *dunno);
 static void status_printer(H3270 *session, int on, void *dunno);
 static unsigned short color_from_fa(unsigned char fa);
-// static void relabel(H3270 *session, int ignored, void *dunno);
-
-void set_display_charset(char *dcs)
-{
-}
 
 static void addch(H3270 *session, int baddr, unsigned char c, unsigned short attr)
 {
diff --git a/selection.c b/selection.c
index 9e67823..6e3f4fe 100644
--- a/selection.c
+++ b/selection.c
@@ -36,6 +36,20 @@
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
+static void get_selected_addr(H3270 *session, int *begin, int *end)
+{
+	if(session->select.begin > session->select.end)
+	{
+		*end   = session->select.begin;
+		*begin = session->select.end;
+	}
+	else
+	{
+		*begin = session->select.begin;
+		*end   = session->select.end;
+	}
+}
+
 static void update_selected_rectangle(H3270 *session)
 {
 	struct
@@ -44,16 +58,10 @@ static void update_selected_rectangle(H3270 *session)
 		int col;
 	} p[2];
 
-	int begin	= session->select.begin;
-	int end		= session->select.end;
-	int row, col, baddr;
 
-	if(begin > end)
-	{
-		baddr 	= end;
-		end		= begin;
-		begin	= baddr;
-	}
+	int begin, end, row, col, baddr;
+
+	get_selected_addr(session,&begin,&end);
 
 	// Get start & end posision
 	p[0].row = (begin/session->cols);
@@ -95,17 +103,10 @@ static void update_selected_rectangle(H3270 *session)
 
 static void update_selected_region(H3270 *session)
 {
-	int baddr;
-	int begin	= session->select.begin;
-	int end		= session->select.end;
-	int len 	= session->rows*session->cols;
+	int baddr,begin,end;
+	int len = session->rows*session->cols;
 
-	if(begin > end)
-	{
-		baddr 	= end;
-		end		= begin;
-		begin	= baddr;
-	}
+	get_selected_addr(session,&begin,&end);
 
 	// First remove unselected areas
 	for(baddr = 0; baddr < begin; baddr++)
@@ -310,3 +311,36 @@ LIB3270_ACTION( reselect )
 	return 0;
 }
 
+LIB3270_EXPORT char * lib3270_get_selected(H3270 *hSession)
+{
+	int	row, col, baddr;
+	char *ret;
+	size_t	  sz = 0;
+
+	if(!hSession->selected || hSession->select.begin == hSession->select.end)
+		return NULL;
+
+	ret = malloc(hSession->rows * (hSession->cols+1));
+
+	baddr = 0;
+	for(row=0;row < hSession->rows;row++)
+	{
+		int cr = 0;
+
+		for(col = 0; col < hSession->cols;col++)
+		{
+			if(hSession->ea_buf[baddr].attr & LIB3270_ATTR_SELECTED)
+			{
+				cr++;
+				ret[sz++] = hSession->ea_buf[baddr].chr;
+			}
+			baddr++;
+		}
+
+		if(cr)
+			ret[sz++] = '\n';
+	}
+	ret[sz] = 0;
+
+	return realloc(ret,sz+1);
+}
diff --git a/trace_ds.c b/trace_ds.c
index 717d075..c0704ae 100644
--- a/trace_ds.c
+++ b/trace_ds.c
@@ -429,7 +429,7 @@ create_tracefile_header(const char *mode)
 	if (appres.extended)
 		wtrace(", extended data stream");
 	wtrace(", %s emulation", appres.m3279 ? "color" : "monochrome");
-	wtrace(", %s charset", get_charset_name());
+	wtrace(", %s charset", lib3270_get_charset(&h3270));
 	if (appres.apl_mode)
 		wtrace(", APL mode");
 	wtrace("\n");
--
libgit2 0.21.2