diff --git a/.classpath b/.classpath
index 3af1ad0..9081dbe 100644
--- a/.classpath
+++ b/.classpath
@@ -22,7 +22,6 @@
 	<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/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index a5c7673..cac0df4 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,11 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/README.md b/README.md
index 8d5bca1..90e7716 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# gCube System - Social Util Library
+# gCube Social Util Library
 
 ## Structure of the project
 
@@ -19,13 +19,31 @@ See [Releases](https://code-repo.d4science.org/gCubeSystem/social-util-library/r
 
 ## Authors
 
+* **Luca Frosini** ([ORCID](https://orcid.org/0000-0003-3183-2291)) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
 * **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
 * **Costantino Perciante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
 
+
 ## Maintainers
 
+* **Luca Frosini** ([ORCID](https://orcid.org/0000-0003-3183-2291)) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
 * **Massimiliano Assante** - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience)
 
+## How to Cite this Software
+
+Tell people how to cite this software. 
+* Cite an associated paper?
+* Use a specific BibTeX entry for the software?
+
+    @software{,
+        title = {gCube Social Util Library},
+        author = {{Frosini, Luca, Assante, Massimiliano, Perciante, Costantino}},
+        organization = {ISTI - CNR},
+        address = {Pisa, Italy},
+        year = 2021,
+        url = {http://www.gcube-system.org/}
+    } 
+
 ## License
 
 This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details.
@@ -40,9 +58,23 @@ by favouring the realisation of reuse oriented policies.
 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 (grant no. 004260);
+    - DILIGENT (grant no. 004260).
 - the Seventh Framework Programme for research, technological development and demonstration 
-    - D4Science (grant no. 212488), D4Science-II (grant no.239019), ENVRI (grant no. 283465), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644);
+    - D4Science (grant no. 212488);
+    - D4Science-II (grant no.239019);
+    - ENVRI (grant no. 283465);
+    - iMarine(grant no. 283644);
+    - EUBrazilOpenBio (grant no. 288754).
 - the H2020 research and innovation programme 
-    - BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024),DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001);
-    
\ No newline at end of file
+    - SoBigData (grant no. 654024);
+    - PARTHENOS (grant no. 654119);
+    - EGIEngage (grant no. 654142);
+    - ENVRIplus (grant no. 654182);
+    - BlueBRIDGE (grant no. 675680);
+    - PerformFish (grant no. 727610);
+    - AGINFRAplus (grant no. 731001);
+    - DESIRA (grant no. 818194);
+    - ARIADNEplus (grant no. 823914);
+    - RISIS2 (grant no. 824091);
+
+  
\ No newline at end of file
diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
index 622f0e7..0893a43 100644
--- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
+++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java
@@ -31,6 +31,11 @@ import org.htmlparser.beans.StringBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @author Costantino Perciante (ISTI - CNR)
+ * @author Massimiliano Assante (ISTI - CNR)
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class Utils {
 
 	/**
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java b/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java
index 4b60a44..73caff1 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java
@@ -5,6 +5,7 @@ import org.gcube.socialnetworking.tokenization.Token;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
+ * @author Massimiliano Assante (ISTI - CNR)
  */
 public class HashTagToken extends ReplaceableToken {
 
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java b/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java
index 5ced686..cae0c81 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/ReplaceableToken.java
@@ -6,6 +6,9 @@ import java.util.Map;
 import org.apache.commons.codec.binary.Base64;
 import org.gcube.socialnetworking.tokenization.Token;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class ReplaceableToken extends Token {
 	
 	protected boolean replaced;
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedHashTag.java b/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedHashTag.java
index 6b4e13e..eb4a546 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedHashTag.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedHashTag.java
@@ -4,6 +4,10 @@ import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ * @author Massimiliano Assante (ISTI - CNR)
+ */
 public class SanitizedHashTag {
 	
 	private static final String RECOGNIZE_HASHTAG_REGEX = "^.{0,3}#[\\w.-]{1,}[\\W]{0,3}";
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedURL.java b/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedURL.java
index 8a4bc62..94245bb 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedURL.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/SanitizedURL.java
@@ -4,6 +4,10 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Objects;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ * @author Massimiliano Assante (ISTI - CNR)
+ */
 public class SanitizedURL {
 	
 	private static String CHARACTERS_TO_REMOVE = "[\\.\\,\\;\\(\\)\\:\\\"\\'\\“\\”\\‘\\’\\«\\»]";
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java b/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java
index 0de4085..a089cc1 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java
@@ -15,6 +15,9 @@ import org.gcube.vomanagement.usermanagement.model.GCubeTeam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class SocialMessageParser {
 
 	private static final Logger logger = LoggerFactory.getLogger(SocialMessageParser.class);
diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java b/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java
index fccde43..efcbfb2 100644
--- a/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java
+++ b/src/main/java/org/gcube/socialnetworking/socialtoken/URLToken.java
@@ -7,6 +7,9 @@ import java.util.Map;
 
 import org.gcube.socialnetworking.tokenization.Token;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class URLToken extends ReplaceableToken {
 	
 	protected SanitizedURL sanitizedURL;
diff --git a/src/main/java/org/gcube/socialnetworking/tokenization/GCubeStringTokenizer.java b/src/main/java/org/gcube/socialnetworking/tokenization/GCubeStringTokenizer.java
index 10230ac..98fae07 100644
--- a/src/main/java/org/gcube/socialnetworking/tokenization/GCubeStringTokenizer.java
+++ b/src/main/java/org/gcube/socialnetworking/tokenization/GCubeStringTokenizer.java
@@ -5,6 +5,9 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class GCubeStringTokenizer {
 
 	/**
diff --git a/src/main/java/org/gcube/socialnetworking/tokenization/Token.java b/src/main/java/org/gcube/socialnetworking/tokenization/Token.java
index 1ba22cf..2de79fe 100644
--- a/src/main/java/org/gcube/socialnetworking/tokenization/Token.java
+++ b/src/main/java/org/gcube/socialnetworking/tokenization/Token.java
@@ -1,5 +1,8 @@
 package org.gcube.socialnetworking.tokenization;
 
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
 public class Token{
 	
 	protected final String token;