diff --git a/CHANGELOG b/CHANGELOG
index 32c587f..ea460bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+version 0.17 (xx Jan 2012)
+ - changed the footer algorithm of style casual to avoid starting lines with
+ the footer symbol.
+
 version 0.16 (15 Jan 2012)
  - added starred versions of \section and \subsection (that are identical to their
  non-starred version, to e.g. enable biblatex support as requested by S. Verberkt
diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf
index dc357a6..fd6604e 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 9e6d00c..24ba3ef 100644
Binary files a/examples/template.pdf and b/examples/template.pdf differ
diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf
index 304f587..95129ac 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 ea4b7ba..227a666 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 58a6795..d09ecb3 100644
Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ
diff --git a/moderncv.cls b/moderncv.cls
index 44f6cb9..0babaff 100644
--- a/moderncv.cls
+++ b/moderncv.cls
@@ -99,7 +99,7 @@
 % hyper links
 \RequirePackage{url}
 \urlstyle{tt}
-% load hyperred at the end of the preamble to pass options required by loaded packages (like CJK)
+% load hyperref at the end of the preamble to pass options required by loaded packages (like CJK)
 \AtEndPreamble{
   \@ifpackageloaded{CJK}
     {\RequirePackage[unicode]{hyperref}}
@@ -313,9 +313,9 @@
   \AtBeginDocument{%
     \if@displaypagenumbers%
       \@ifundefined{r@lastpage}{}{%
-        \ifthenelse{\pageref{lastpage} > 1}{%
+        \ifthenelse{\pageref{lastpage}>1}{%
           \fancypagestyle{plain}{%
-            \fancyfoot[r]{\addressfont\color{color2}\footnotesize\thepage/\pageref{lastpage}}}%
+            \fancyfoot[r]{\color{color2}\footnotesize\itshape\thepage/\pageref{lastpage}}}%
           \pagestyle{plain}}{}}%
       \AtEndDocument{\label{lastpage}}\else\fi}}
 
diff --git a/moderncvstylecasual.sty b/moderncvstylecasual.sty
index 09d33f1..8bd7eea 100644
--- a/moderncvstylecasual.sty
+++ b/moderncvstylecasual.sty
@@ -32,28 +32,53 @@
 \renewcommand*{\addressfont}{\small\mdseries\slshape}
 
 % cv footer
+%   internal command to print a footer symbol to separate footer elements when
+%   required (i.e. when the element is not the first)
 \newif\if@firstfooterelement\@firstfooterelementtrue
 \newcommand*{\footersymbol}{%
   \if@firstfooterelement%
   \else%
-    { ~~\color{color2}\textbullet~~~}\fi\@firstfooterelementfalse}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :(
+    { ~~\color{color2}\textbullet~~~}\fi}% \textbullet forces the use of the CMSY font, even when latin modern fonts are used :(
+%   internal command to add an element to the footer
+%   it collects the elements in a temporary box, and checks when to flush the box
+%   and resets \@firstfooterelement
+\newsavebox{\footertempabox}%
+\newsavebox{\footertempbbox}%
+\newlength{\footerwidth}%
+\newlength{\footerboxwidth}%
+\newcommand*{\addtofooter}[1]{%
+  \savebox{\footertempbbox}{\usebox{\footertempabox}\footersymbol#1}%
+  \settowidth{\footerboxwidth}{\usebox{\footertempbbox}}%
+  \ifnum\footerboxwidth<\footerwidth%
+    \savebox{\footertempabox}{\usebox{\footertempbbox}}
+    \@firstfooterelementfalse%
+  \else%
+    \flushfooter{}\\%
+    \savebox{\footertempabox}{#1}%
+    \savebox{\footertempbbox}{#1}%
+    \@firstfooterelementfalse\fi}
+%   internal command to flush the footer
+\newcommand*{\flushfooter}{%
+  \usebox{\footertempabox}%
+  \savebox{\footertempabox}{}%
+  \savebox{\footertempbbox}{}}
 \renewcommand*{\makefooter}{%
+  \setlength{\footerwidth}{0.8\textwidth}%
   \fancypagestyle{plain}{%
     \fancyfoot[c]{%
-      \parbox{0.8\textwidth}{%
-      \centering%
-      \addressfont\color{color2}%
-      \ifthenelse{\isundefined{\@addressstreet}}{}{%
-        \addresssymbol\@addressstreet%
-        \@firstfooterelementfalse%
-        \ifthenelse{\isundefined{\@addresscity}}{}{~--~\@addresscity}\\\@firstfooterelementtrue}%
-      \ifthenelse{\isundefined{\@mobile}}{}{\footersymbol\mobilesymbol\@mobile\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@phone}}{}{\footersymbol\phonesymbol\@phone\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@fax}}{}{\footersymbol\faxsymbol\@fax\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@email}}{}{\footersymbol\emailsymbol\emaillink{\@email}\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@homepage}}{}{\footersymbol\homepagesymbol\httplink{\@homepage}\@firstfooterelementfalse}%
-      \ifthenelse{\isundefined{\@extrainfo}}{}{\footersymbol\@extrainfo\@firstfooterelementfalse}}}%
-  }%
+      \parbox{\footerwidth}{%
+        \centering%
+        \addressfont\color{color2}%
+        \ifthenelse{\isundefined{\@addressstreet}}{}{%
+          \addresssymbol\@addressstreet%
+          \ifthenelse{\isundefined{\@addresscity}}{}{~--~\@addresscity}\\}%
+        \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}%
+        \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}%
+        \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}%
+        \ifthenelse{\isundefined{\@email}}{}{\addtofooter{\emailsymbol\emaillink{\@email}}}%
+        \ifthenelse{\isundefined{\@homepage}}{}{\addtofooter{\homepagesymbol\httplink{\@homepage}}}%
+        \ifthenelse{\isundefined{\@extrainfo}}{}{\addtofooter{\@extrainfo}}%
+        \flushfooter}}}%
   \pagestyle{plain}}
 
 % maketitle
diff --git a/moderncvstyleoldstyle.sty b/moderncvstyleoldstyle.sty
index 8b374e0..447f269 100644
--- a/moderncvstyleoldstyle.sty
+++ b/moderncvstyleoldstyle.sty
@@ -174,7 +174,7 @@
 \newlength{\cventrytitleboxwidth}
 \renewcommand*{\cventry}[7][.25em]{%
   \savebox{\cventryyearbox}{%
-    \hspace*{\separatorcolumnwidth}%
+    \hspace*{2\separatorcolumnwidth}%
     {\hintfont#2}}%
   \setlength{\cventrytitleboxwidth}{\widthof{\usebox{\cventryyearbox}}}%
   \setlength{\cventrytitleboxwidth}{\maincolumnwidth-\cventrytitleboxwidth}%
@@ -186,10 +186,11 @@
       \ifthenelse{\equal{#6}{}}{}{, #6}%
       .}%
     \usebox{\cventryyearbox}%
-    \ifx&#7&%
+  \end{minipage}%
+  \ifx&#7&%
     \else{%
       \newline{}\begin{minipage}[t]{\maincolumnwidth}\small#7\end{minipage}}\fi%
-  \end{minipage}\\[#1]}
+  \\[#1]}
 
 
 \newbox{\cvitemwithcommentmainbox}