diff --git a/.gitignore b/.gitignore
index 95c219f..5b5e02f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /nbproject/
 image.jpg
 /.project
+dist/
 /.settings/
 node_modules/
 .envrc
@@ -9,3 +10,4 @@ node_modules/
 *.iml
 .idea/
 .DS_Store
+npm-debug.log
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..37fad4a
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,5 @@
+tests/
+examples/
+Gruntfile.js
+bower.json
+src/
diff --git a/.travis.yml b/.travis.yml
index 2817adb..12ad85e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,29 @@
----
 language: node_js
 node_js:
 - '0.10'
 env:
   global:
-  - secure: "eW41gIqOizwO4pTgWnAAbW75AP7F+CK9qfSed/fSh4sJ9HWMIY1YRIaY8gjr+6jV/f7XVHcXuym6ZxgINYSkVKbF1JKxBJNLOXtSgNbVHSic58pYFvUjwxIBI9aPig9uux1+DbnpWqXFDTcACJSevQZE0xwmjdrSkDLgB0G34v8="
-  - secure: "Y2Av+Gd3z9uQEB36GwdOOuGka0hx0/HeitASEo59z934O8RxnmN9eNTXS7dDT3XtKtwxIyLTOEpS7qlRdWahH28hr/dS4xJj6ao58C+1xMcDs6NAPGmDxUlcJWpcGEsnjmXjQCc3fBioSTdpIBrK/gdvgpNh77UKG74Sk7Z+YGk="
-  - secure: "YI+YbTOGf2x4fPMKW+KhJiZWswoXT6xOKGwLfsQsVwmFX1LerJouil5D5iYOQuL4FE3pNaoJSNakIsokJQuGKJMmnPc8rdhMZuBJBk6MRghurE2Xe9qBHfuUBPlfD61nARESm4WDcyMwM0QVYaOKeY6aIpZ91qbUbyc60EEx3C4="
+  - secure: eW41gIqOizwO4pTgWnAAbW75AP7F+CK9qfSed/fSh4sJ9HWMIY1YRIaY8gjr+6jV/f7XVHcXuym6ZxgINYSkVKbF1JKxBJNLOXtSgNbVHSic58pYFvUjwxIBI9aPig9uux1+DbnpWqXFDTcACJSevQZE0xwmjdrSkDLgB0G34v8=
+  - secure: Y2Av+Gd3z9uQEB36GwdOOuGka0hx0/HeitASEo59z934O8RxnmN9eNTXS7dDT3XtKtwxIyLTOEpS7qlRdWahH28hr/dS4xJj6ao58C+1xMcDs6NAPGmDxUlcJWpcGEsnjmXjQCc3fBioSTdpIBrK/gdvgpNh77UKG74Sk7Z+YGk=
+  - secure: YI+YbTOGf2x4fPMKW+KhJiZWswoXT6xOKGwLfsQsVwmFX1LerJouil5D5iYOQuL4FE3pNaoJSNakIsokJQuGKJMmnPc8rdhMZuBJBk6MRghurE2Xe9qBHfuUBPlfD61nARESm4WDcyMwM0QVYaOKeY6aIpZ91qbUbyc60EEx3C4=
 addons:
   sauce_connect: true
 before_script:
-  - npm install -g grunt-cli
-  - npm install -g uglify-js
+- npm install -g grunt-cli
+- npm install -g uglify-js
 notifications:
   webhooks:
     urls:
-      - https://webhooks.gitter.im/e/2b007d4f86de89588804
+    - https://webhooks.gitter.im/e/2b007d4f86de89588804
     on_success: always
     on_failure: always
     on_start: false
+deploy:
+  - provider: npm
+    email: niklasvh@gmail.com
+    api_key:
+      secure: dot+HzIe3thKep5mz5pyNYQV1ZYiGlVQAWScmfYh75AtOCJQJGvvw1alwRZDL0Ykn/7LeftZik845INn8Al8h4OEUQyuq2WmybZ5zn7PsLXRes7FtlJeYERO79bV5P3aV4vq4QoaZkPB5jQ98CmgQ2/9xPB+1ogNd7fRfUpSvSI=
+    on:
+      tags: true
+      branch: master
+      repo: niklasvh/html2canvas
diff --git a/package.json b/package.json
index 8e5eb7f..5f5de92 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "title": "html2canvas",
   "name": "html2canvas",
   "description": "Screenshots with JavaScript",
-  "main": "src/core.js",
+  "main": "dist/html2canvas.js",
   "version": "0.5.0-alpha2",
   "author": {
     "name": "Niklas von Hertzen",