diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0223257f8b15885f469dc34572b18b0cf8a0fffd..e237fff25f41b44edc52562e3c139215abb98e99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ All notable changes to this project will be documented in this file.
   Here is a regex to fix existing code: `(?<=\\ifsingleauthor)(\{.*?\})\\else(\{.*?\})\\fi(\\space)?`
   which you can replace with `$1$2`.
 
+### Added
+
+- Using the `\and` command inside `\author` or `\matrikelnr` now works as expected (#21)
+
 ## [3.2]
 
 ### Fixed
diff --git a/src/HsH-Logo.pdf b/src/HsH-Logo.pdf
index cf3b12a738500c8381155a8aa18c3a341472c6de..eb0c23a2f91a30e1a46a267c35c3c78f60368911 100644
--- a/src/HsH-Logo.pdf
+++ b/src/HsH-Logo.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76197994ebca0e82c4fb4be663c9df2123c74d05991ca492fbfd44d8c0568a95
-size 25798
+oid sha256:d010945bf17d80d935a688d9c484c2424d6aa99c01fe1ddf74e330f3e13cef8d
+size 25799
diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index a694c7f602373af42b130a83d472b25d8d1fb211..218862e992adf4c2e571be8ed3148f679347d01b 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -312,13 +312,15 @@
     }
   }
 }
-\let\@author\@empty
 \renewcommand{\title}[2][]{
   \gdef\@title{#2}
   \gdef\@shorttitle{#1}
 }
 \def\@shorttitle{\@empty}
-\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}
+\def\gdef@with@and@as@comma#1#2{{\def\and{,}\xdef#1{#2}}}
+\renewcommand{\author}[1]{\gdef@with@and@as@comma\@author{#1}}
+\let\@author\@empty
+\newcommand{\matrikelnr}[1]{\gdef@with@and@as@comma\@matrikelnr{#1}}
 \def\@matrikelnr{\@empty}
 \newcommand{\professor}[1]{\gdef\@professor{#1}}
 \def\@professor{\@empty}
diff --git a/src/HsH-classes.dtx b/src/HsH-classes.dtx
index 8459c89d032e90de4161294f1ecc165823abe237..07122b8e9916ae8ebb8417bc13b1c1b2d5256162 100644
--- a/src/HsH-classes.dtx
+++ b/src/HsH-classes.dtx
@@ -1160,12 +1160,6 @@ http://www.latex-project.org/lppl.txt
 %     how the user can define the differnt datafields.
 %     \smallskip
 %
-%     First the |\@author| macro is set to |\@empty|, this makes it easyer to handle it
-%     later.
-%    \begin{macrocode}
-\let\@author\@empty
-%    \end{macrocode}
-%
 %     \begin{macro}{\title}
 %       We redefine the |\title| command to take a optional argument. This is stored in
 %       the additional |\@shorttitle| macro.
@@ -1185,11 +1179,33 @@ http://www.latex-project.org/lppl.txt
 %    \end{macrocode}
 %     \end{macro}
 %
+%     \begin{macro}{\gdef@with@and@as@comma}
+%       First we define a helpermacro that will fill a given macro while treating the
+%       |\and| command as a comma. This is needed for |\author| and |\matrikelnr| where
+%       we later treat them as comma-seperated lists when the titlepage gets constructed.
+%    \begin{macrocode}
+\def\gdef@with@and@as@comma#1#2{{\def\and{,}\xdef#1{#2}}}
+%    \end{macrocode}
+%     \end{macro}
+%
+%     \begin{macro}{\author}
+%       We redefine the |\author| command so that it sets |\@author|, but allowing for both
+%       comma and |\and| to be used as a seperator.
+%    \begin{macrocode}
+\renewcommand{\author}[1]{\gdef@with@and@as@comma\@author{#1}}
+%    \end{macrocode}
+%     The |\@author| macro is also set to |\@empty|, this makes it easier to handle it
+%     later.
+%    \begin{macrocode}
+\let\@author\@empty
+%    \end{macrocode}
+%     \end{macro}
+%
 %     \begin{macro}{\matrikelnr,\@matrikelnr}
 %       These macros set and store the matrikel-number (or set of numbers), which will
 %       be printed on the titlepage.
 %    \begin{macrocode}
-\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}
+\newcommand{\matrikelnr}[1]{\gdef@with@and@as@comma\@matrikelnr{#1}}
 \def\@matrikelnr{\@empty}
 %    \end{macrocode}
 %     \end{macro}
diff --git a/src/HsH-classes.pdf b/src/HsH-classes.pdf
index 02498f0218ce35aa65192f163a8c3934b431c614..5cbd66adf19083b5843581cecb24c02adb0a75db 100644
--- a/src/HsH-classes.pdf
+++ b/src/HsH-classes.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bf02dfeda7b514c84f7b75224d71737e69a3d3d11034ca919e37fb2328f8e1c
-size 313902
+oid sha256:bd770da07ea6e76086af2b64a0c586218e56a12b1e0d36d4c603989ad9aee7a2
+size 314585
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 82b5dc439c1c6c93d9398ea80290d651ff1d13b3..7276de998ba968e7890315d35c454326348b8c5e 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -325,13 +325,15 @@
     }
   }
 }
-\let\@author\@empty
 \renewcommand{\title}[2][]{
   \gdef\@title{#2}
   \gdef\@shorttitle{#1}
 }
 \def\@shorttitle{\@empty}
-\newcommand{\matrikelnr}[1]{\gdef\@matrikelnr{#1}}
+\def\gdef@with@and@as@comma#1#2{{\def\and{,}\xdef#1{#2}}}
+\renewcommand{\author}[1]{\gdef@with@and@as@comma\@author{#1}}
+\let\@author\@empty
+\newcommand{\matrikelnr}[1]{\gdef@with@and@as@comma\@matrikelnr{#1}}
 \def\@matrikelnr{\@empty}
 \newcommand{\professor}[1]{\gdef\@professor{#1}}
 \def\@professor{\@empty}
diff --git a/test.pdf b/test.pdf
index 57c05de98e42c7f8670db75e596e34550426db09..739ca9d7abf5e2cd504929b5127f23566c29457c 100644
--- a/test.pdf
+++ b/test.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b6b7de03c45c0bbfb574163244db23a16043865028914163b61f57542abb078
-size 239184
+oid sha256:00b82d6601c04ba5bbec6c77209727feacf5e30723f3f90b058f969b21cb8e17
+size 240013
diff --git a/test.tex b/test.tex
index e1e985090f3e0a77c49274083beae60dbff76396..bc77eaeb838b2c44644ac75e0cbcc528bd45e09e 100644
--- a/test.tex
+++ b/test.tex
@@ -6,9 +6,13 @@
 
 %% documents personal data:
 \author{
-	Max Mustermann,
+	Max Mustermann \and
 	Mira Musterfrau
 }
+\matrikelnr{
+	12345678,
+	12345
+}
 \titlehead{titlehead}
 \subject{Subject}
 \title{long and elaborate title that just goes on and on without stopping}