diff --git a/.travis.yml b/.travis.yml
index 1f26b6b..50e9a6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,15 @@
 language: cpp
-compiler: 
+
+os:
+  - linux
+  - osx
+
+compiler:
   - g++
   - clang
-os: linux
 
-before_script: cmake . 
-script: make && ./xmltest
+before_script: cmake .
+
+script:
+  - make -j3
+  - ./xmltest
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..aac8867
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,7 @@
+before_build:
+  - cmake .
+
+build_script:
+  - msbuild tinyxml2.sln /m /p:Configuration=Release /t:ALL_BUILD
+  - copy Release\xmltest.exe .\ && copy Release\tinyxml2.dll .\
+  - xmltest.exe
diff --git a/readme.md b/readme.md
index 485e00f..38c29dc 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-TinyXML-2
+TinyXML-2 [![TravisCI Status](https://travis-ci.org/leethomason/tinyxml2.svg?branch=master)](https://travis-ci.org/leethomason/tinyxml2) [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/leethomason/tinyxml2?branch=master&svg=true)](https://ci.appveyor.com/project/leethomason/tinyxml2)
 =========
 ![TinyXML-2 Logo](http://www.grinninglizard.com/tinyxml2/TinyXML2_small.png)