diff --git a/.classpath b/.classpath
index 9d6791c..b9ae59d 100644
--- a/.classpath
+++ b/.classpath
@@ -22,6 +22,7 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..4e3a931
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,51 @@
+
+# Changelog for social util library
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+## [v1.7.3] - 2019-12-19
+
+[#18356] Bug Fixed: Social networking ... error in parsing URLs ending with ")"
+
+## [v1.7.2] - 2019-12-19
+
+[#18122] Bug Fixed: Social Util Library parsing exceptions
+
+[#17811] Bug Fixed: Fixed Avoid # being considered an hastagged topic
+
+[#17844] Bug Fixed: Hashtag does not support numbers e.g. #4.15.0
+
+
+## [v1.6.0] - 2019-03-29
+
+[#13207] Revised social networking library mechanism for http links, mentions and hashtags recognition
+
+
+## [v1.3.0] - 2017-12-31
+
+[#10700] Fixed regex for hashtags
+
+[#10984] Fixed regex for urls 
+
+## [v1.2.1] - 2017-11-13
+
+[#10234] Fixed regex for urls
+
+## [v1.2.0] - 2017-04-13
+
+[#19709] Email Templates library to support a new template or invitation to join VREs
+
+Added method to remove html tags from a text (useful for #247)
+
+## [v1.0.1] - 2016-10-01
+
+[#4937] Hashtag regular expression updated
+
+URL regular expression updated
+
+
+## [v1.0.0] - 2016-06-01
+
+First release 
diff --git a/FUNDING.md b/FUNDING.md
new file mode 100644
index 0000000..6fa9eac
--- /dev/null
+++ b/FUNDING.md
@@ -0,0 +1,26 @@
+# Acknowledgments
+
+The projects leading to this software have received funding from a series of European Union programmes including:
+
+- the Sixth Framework Programme for Research and Technological Development
+    - [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
+- the Seventh Framework Programme for research, technological development and demonstration 
+    - [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
+    - [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
+    - [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
+    - [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
+    - [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
+- the H2020 research and innovation programme 
+    - [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
+    - [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
+    - [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
+    - [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
+    - [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
+    - [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
+    - [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
+    - [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
+    - [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
+    - [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
+    - [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
+    - [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
+    - [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);
\ No newline at end of file
diff --git a/changelog.xml b/changelog.xml
deleted file mode 100644
index 47fda4c..0000000
--- a/changelog.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<ReleaseNotes>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-6-0"
-		date="2019-03-29">
-		<Change>Revised social networking library mechanism for http links, mentions and hashtags recognition, #13207</Change>
-	</Changeset>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-4-0"
-		date="2018-06-19">
-		<Change>Removed deprecated dependency ws-mail widget</Change>
-	</Changeset>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-3-0"
-		date="2017-12-31">
-		<Change>Fixed regex for hashtags (#10700)
-		</Change>
-		<Change>Fixed regex for urls (#10984)</Change>
-	</Changeset>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-2-1"
-		date="2017-11-13">
-		<Change>Fixed regex for urls (#10234)
-		</Change>
-	</Changeset>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-2-0"
-		date="2017-04-13">
-		<Change>Added method to remove html tags from a text (useful for #247)
-		</Change>
-	</Changeset>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-1-0"
-		date="2017-04-13">
-		<Change>Bug #8063, Share Updates links are truncated in some cases
-		</Change>
-	</Changeset>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-0-1"
-		date="2016-10-01">
-		<Change>Hashtag regular expression updated (See ticket #4937)</Change>
-		<Change>Url regular expression updated</Change>
-	</Changeset>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-0-0"
-		date="2016-06-01">
-		<Change>First Release</Change>
-	</Changeset>
-</ReleaseNotes>
diff --git a/descriptor.xml b/descriptor.xml
deleted file mode 100644
index 9144461..0000000
--- a/descriptor.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-				<include>profile.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-		<fileSet>
-			<directory>target/apidocs</directory>
-			<outputDirectory>/${artifactId}/doc/api</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<fileMode>755</fileMode>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>${distroDirectory}/profile.xml</source>
-			<outputDirectory>./</outputDirectory>
-			<filtered>true</filtered>
-		</file>
-		<file>
-			<source>target/${build.finalName}.jar</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e6d34ab..1a00240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.socialnetworking</groupId>
 	<artifactId>social-util-library</artifactId>
-	<version>1.7.2</version>
+	<version>1.7.3</version>
 	<name>social-util-library</name>
 	<description>
 	The social-util-library contains utility functions that can be used by the social-networking portlets.