diff --git a/.Rbuildignore b/.Rbuildignore
index 7f1c8569..51c54326 100755
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -3,3 +3,4 @@
 .travis.yml
 .zenodo.json
 ^cran-comments\.md$
+^appveyor\.yml$
diff --git a/DESCRIPTION b/DESCRIPTION
index ac6b45c2..cfeb8bfa 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: AMR
-Version: 0.2.0.9023
+Version: 0.2.0.9024
 Date: 2018-08-13
 Title: Antimicrobial Resistance Analysis
 Authors@R: c(
@@ -7,13 +7,13 @@ Authors@R: c(
         given = c("Matthijs", "S."),
         family = "Berends",
         email = "m.s.berends@umcg.nl",
-        role = c("aut", "dis", "cre"),
+        role = c("aut", "cre"),
         comment = c(ORCID = "0000-0001-7620-1800")),
     person(
         given = c("Christian", "F."),
         family = "Luz",
         email = "c.f.luz@umcg.nl",
-        role = c("aut", "dis"),
+        role = c("aut", "rev"),
         comment = c(ORCID = "0000-0001-5809-5995")),
     person(
         given = c("Erwin", "E.A."),
@@ -30,7 +30,7 @@ Authors@R: c(
         given = c("Alex", "W."),
         family = "Friedrich",
         email = "alex.friedrich@umcg.nl",
-        role = c("ths", "ldr"),
+        role = "ths",
         comment = c(ORCID = "0000-0003-4881-038X")),
     person(
         given = "Bhanu",
diff --git a/NEWS.md b/NEWS.md
index 516e699a..7665934f 100755
--- a/NEWS.md
+++ b/NEWS.md
@@ -64,6 +64,7 @@
 
 #### Other
 * Unit testing for all Linux and macOS releases of R 3.1 and higher: https://travis-ci.org/msberends/AMR
+* Added units tests for Windows with AppVeyor
 * Added thesis advisors to DESCRIPTION file
 
 # 0.2.0 (latest stable version)
diff --git a/README.md b/README.md
index 4e1656ab..cb452ebe 100755
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Erwin E.A. Hassing<sup>2</sup>,
   
 <sup>1</sup> Department of Medical Microbiology, University of Groningen, University Medical Center Groningen, Groningen, the Netherlands - [rug.nl](http://www.rug.nl) [umcg.nl](http://www.umcg.nl)<br>
 <sup>2</sup> Certe Medical Diagnostics & Advice, Groningen, the Netherlands - [certe.nl](http://www.certe.nl)<br>
-<sup>a</sup> R package author and dissertant<br>
+<sup>a</sup> R package author and thesis dissertant<br>
 <sup>b</sup> Thesis advisor
 
 <a href="https://www.rug.nl"><img src="man/figures/logo_rug.png" height="60px"></a>
@@ -83,6 +83,7 @@ This package [is published on CRAN](http://cran.r-project.org/package=AMR), the
 
 ### Install from GitHub
 [![Travis_Build](https://travis-ci.org/msberends/AMR.svg?branch=master)](https://travis-ci.org/msberends/AMR)
+[![AppVeyor_Build](https://ci.appveyor.com/api/projects/status/github/msberends/AMR?branch=master&svg=true)](https://ci.appveyor.com/project/msberends/AMR)
 [![Since_Release](https://img.shields.io/github/commits-since/msberends/AMR/latest.svg?colorB=3679BC)](https://github.com/msberends/AMR/commits/master)
 [![Last_Commit](https://img.shields.io/github/last-commit/msberends/AMR.svg)](https://github.com/msberends/AMR/commits/master)
 [![Code_Coverage](https://codecov.io/gh/msberends/AMR/branch/master/graph/badge.svg)](https://codecov.io/gh/msberends/AMR)
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..c6c14384
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,45 @@
+# DO NOT CHANGE the "init" and "install" sections below
+
+# Download script file from GitHub
+init:
+  ps: |
+        $ErrorActionPreference = "Stop"
+        Invoke-WebRequest http://raw.github.com/krlmlr/r-appveyor/master/scripts/appveyor-tool.ps1 -OutFile "..\appveyor-tool.ps1"
+        Import-Module '..\appveyor-tool.ps1'
+
+install:
+  ps: Bootstrap
+
+cache:
+  - C:\RLibrary
+
+# Adapt as necessary starting from here
+
+build_script:
+  - travis-tool.sh install_deps
+
+test_script:
+  - travis-tool.sh run_tests
+
+on_failure:
+  - 7z a failure.zip *.Rcheck\*
+  - appveyor PushArtifact failure.zip
+
+artifacts:
+  - path: '*.Rcheck\**\*.log'
+    name: Logs
+
+  - path: '*.Rcheck\**\*.out'
+    name: Logs
+
+  - path: '*.Rcheck\**\*.fail'
+    name: Logs
+
+  - path: '*.Rcheck\**\*.Rout'
+    name: Logs
+
+  - path: '\*_*.tar.gz'
+    name: Bits
+
+  - path: '\*_*.zip'
+    name: Bits