diff --git a/README.md b/README.md
index 32e62ef..316cb3c 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,6 @@ A pandoc LaTeX template for creating a curriculum vitae.
 
 *Pancv* uses packages [moderncv](https://launchpad.net/moderncv) and [europasscv](https://github.com/gmazzamuto/europasscv).
 
-***Warning***: Europass support is still experimental.
-
 ### Installation
 
 - Install pandoc and a LaTeX distribution.
@@ -63,6 +61,8 @@ For example, you can get the same result as the [previous example](#usage) throu
 docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` norangebit/pandocker pandoc cv.yaml --template pancv -o cv.pdf
 ```
 
+***Warning***: Europass is still not supported via docker.
+
 ### Variables
 
 - `europass` (*boolean*) equal to `true` if you want a curriculum in *europass* format (default to false)
@@ -99,8 +99,6 @@ docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` norangebit/pandock
 
 *Pancv* utilizza il pacchetto [moderncv](https://launchpad.net/moderncv) e il pacchetto [europasscv](https://github.com/gmazzamuto/europasscv).
 
-***Attenzione***: Il supporto al formato europass è ancora in fase sperimentale.
-
 ### Installazione
 
 - Installare pandoc e una distribuzione LaTeX.
@@ -143,6 +141,8 @@ Per esempio si può ottenere lo stesso risultato dell'[esempio precedente](#uso)
 docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` norangebit/pandocker pandoc cv.yaml --template pancv -o cv.pdf
 ```
 
+***Attenzione***: Europass ancora non è supportato tramite docker.
+
 ### Variabili
 
 - `europass` (*boolean*) pari a `true` se si desidera un curriculum in formato *europass*
diff --git a/examples/europasscv/europasscv.pdf b/examples/europasscv/europasscv.pdf
index b4addd7..f8c0e23 100644
Binary files a/examples/europasscv/europasscv.pdf and b/examples/europasscv/europasscv.pdf differ
diff --git a/examples/europasscv/europasscv.yaml b/examples/europasscv/europasscv.yaml
index 1e7bc37..c96234c 100644
--- a/examples/europasscv/europasscv.yaml
+++ b/examples/europasscv/europasscv.yaml
@@ -14,7 +14,6 @@ cron-sections:
       - year: 2018--2020
         degree: Job Title
         institution: Institution
-        city: City
         grade: Grade
   - section: Education
     entries:
@@ -28,7 +27,6 @@ cron-sections:
         degree: Degree
         institution: Institution
         city: City
-        grade: Grade
         description: Insert here the description
 sections:
   - section: Languages
diff --git a/pancv.tex b/pancv.tex
index c39d4b2..36e2e97 100644
--- a/pancv.tex
+++ b/pancv.tex
@@ -16,7 +16,10 @@ $if(europass)$
 }
 
 \newcommand{\pancvaddress}[2]{
-  \ecvaddress{#1, #2}
+  \ecvaddress{%
+    #1%
+    \ifthenelse{\isempty{#2}{}}{}{, #2}
+  }
 }
 
 \newcommand{\pancvsection}[1]{
@@ -24,12 +27,12 @@ $if(europass)$
 }
 
 \newcommand{\pancventry}[6]{
-  \ecvitem{#1}{
+  \ecvitem{#1}{%
     \textbf{#2},
-    #3.
-    \ifthenelse{\isempty{#4}}{}{#4}
-    \ifthenelse{\isempty{#5}}{}{#5.}
-    \ifthenelse{\isempty{#6}}{}{\newline #6}}
+    #3%
+    \ifthenelse{\isempty{#4}}{.}{, #4.}%
+    \ifthenelse{\isempty{#5}}{}{ #5.}%
+    \ifthenelse{\isempty{#6}}{}{\newline #6}}%
 }
 
 \newcommand{\pancvitem}[2]{