diff --git a/CHANGELOG b/CHANGELOG
index a02e9e6..f63fbab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
-version 1.1.0 (xx Apr 2012)
+version 1.1.0 (xx Jul 2012)
+ - prepared moderncv for fontspec font loading (still commented in code).
+ - changed the handling of the "sans" and "roman" class options, to be reflected
+ at the beginning of the document and override style font choices.
+ - turned unicode support in hyperref on by default.
 
 version 1.0.0 (26 Mar 2012)
  - added commands to generate letters for every resume style: \recipient, \date,
diff --git a/examples/template-es.pdf b/examples/template-es.pdf
index ca3cf90..298b4c5 100644
Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ
diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf
index 2fea17f..e6224ec 100644
Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ
diff --git a/examples/template.pdf b/examples/template.pdf
index e9d5727..167ce43 100644
Binary files a/examples/template.pdf and b/examples/template.pdf differ
diff --git a/examples/template_banking_black.pdf b/examples/template_banking_black.pdf
index 56c82a6..e55fe50 100644
Binary files a/examples/template_banking_black.pdf and b/examples/template_banking_black.pdf differ
diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf
index 0d0c651..c8832e4 100644
Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ
diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf
index f396d05..a958c2e 100644
Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ
diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf
index 551c6a4..ccbd4e6 100644
Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ
diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf
index c06b5e0..71c3c81 100644
Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ
diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf
index b52cd56..f797e9e 100644
Binary files a/examples/template_oldstyle_grey.pdf and b/examples/template_oldstyle_grey.pdf differ
diff --git a/moderncv.cls b/moderncv.cls
index 5c32588..84584d8 100644
--- a/moderncv.cls
+++ b/moderncv.cls
@@ -119,24 +119,22 @@
 \RequirePackage{url}
 \urlstyle{tt}
 \AtEndPreamble{
-  \@ifpackageloaded{CJK}
-    {\RequirePackage[unicode]{hyperref}}
-    {\RequirePackage{hyperref}}
-    \hypersetup{
-      breaklinks,
-      baseurl       = http://,
-      pdfborder     = 0 0 0,
-      pdfpagemode   = UseNone,% do not show thumbnails or bookmarks on opening
-      pdfpagelabels = false,% to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
-      pdfstartpage  = 1,
-      pdfcreator    = {\LaTeX{} with `moderncv' package},
-%      pdfproducer   = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used
-      bookmarksopen = true,
-      bookmarksdepth= 2,% to show sections and subsections
-      pdfauthor     = {\@firstname{}~\@familyname{}},
-      pdftitle      = {\@firstname{}~\@familyname{} -- \@title{}},
-      pdfsubject    = {Resum\'{e} of \@firstname{}~\@familyname{}},
-      pdfkeywords   = {\@firstname{}~\@familyname{}, curriculum vit\ae{}, resum\'{e}}}
+  \RequirePackage[unicode]{hyperref}
+  \hypersetup{
+    breaklinks,
+    baseurl       = http://,
+    pdfborder     = 0 0 0,
+    pdfpagemode   = UseNone,% do not show thumbnails or bookmarks on opening
+    pdfpagelabels = false,% to avoid a warning setting it automatically to false anyway, because hyperref detects \thepage as undefined (why?)
+    pdfstartpage  = 1,
+    pdfcreator    = {\LaTeX{} with 'moderncv' package},
+%    pdfproducer   = {\LaTeX{}},% will/should be set automatically to the correct TeX engine used
+    bookmarksopen = true,
+    bookmarksdepth= 2,% to show sections and subsections
+    pdfauthor     = {\@firstname{}~\@familyname{}},
+    pdftitle      = {\@firstname{}~\@familyname{} -- \@title{}},
+    pdfsubject    = {Resum\'{e} of \@firstname{}~\@familyname{}},
+    pdfkeywords   = {\@firstname{}~\@familyname{}, curriculum vit\ae{}, resum\'{e}}}
   \pagenumbering{arabic}% has to be issued after loading hyperref
 }