diff --git a/CHANGELOG b/CHANGELOG
index 41659bf..e2095c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.1.8
+* Fix file download for Linux and Mac machines.
+
 0.1.7
 * Add pillow to required dependencies
 * Fix pillow Image import
diff --git a/setup.py b/setup.py
index 25a5888..0f0adb5 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '0.1.8.dev'
+version = '0.1.9.dev'
 
 setup(name='testdroid',
       version=version,
diff --git a/testdroid/__init__.py b/testdroid/__init__.py
index c5bf9b4..4a08a64 100755
--- a/testdroid/__init__.py
+++ b/testdroid/__init__.py
@@ -7,8 +7,7 @@
 from collections import namedtuple
 from datetime import datetime
 
-FORMAT = '%(message)s'
-__version__ = '0.1.8.dev'
+__version__ = '0.1.9.dev'
 logging.basicConfig(format=FORMAT)
 logger = logging.getLogger('testdroid')
 logger.setLevel(logging.INFO)
@@ -172,7 +171,12 @@ def download(self, path=None, filename=None, payload={}, callback=None):
                 pos = 0
                 total = res.headers['content-length']
 
-                fd = os.open(filename, os.O_RDWR|os.O_CREAT|os.O_BINARY)
+                # Check if the system is Windows or not.
+                if os.name == 'nt':
+                    fd = os.open(filename, os.O_RDWR|os.O_CREAT|os.O_BINARY)
+                else:
+                    fd = os.open(filename, os.O_RDWR|os.O_CREAT)
+
                 for chunk in res.iter_content(self.download_buffer_size):
                     os.write(fd, chunk)
                     if callback: