diff --git a/HISTORY.md b/HISTORY.md
index c705403..e66e5a4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,8 @@
+## master
+
+### Breaking Changes:
+- switched configuration request_timeout from seconds to milliseconds
+
 ## 2.0.0 (2018-02-09)
 
 ### Features:
diff --git a/README.rst b/README.rst
index 5fc110f..1436405 100644
--- a/README.rst
+++ b/README.rst
@@ -29,8 +29,8 @@ import and configure the library with your Castle API secret.
     # For authenticate method you can set failover strategies: allow(default), deny, challenge, throw
     configuration.failover_strategy = 'deny'
 
-    # Castle::RequestError is raised when timing out in seconds (default: 0.5 of the second)
-    configuration.request_timeout = 1
+    # Castle::RequestError is raised when timing out in milliseconds (default: 500 milliseconds)
+    configuration.request_timeout = 1000
 
     # Whitelisted and Blacklisted headers are case insensitive and allow to use _ and - as a separator, http prefixes are removed
     # Whitelisted headers
diff --git a/castle/configuration.py b/castle/configuration.py
index 1a9a6dc..c406191 100644
--- a/castle/configuration.py
+++ b/castle/configuration.py
@@ -19,7 +19,7 @@ WHITELISTED = [
 BLACKLISTED = ['HTTP_COOKIE']
 
 # 500 milliseconds
-REQUEST_TIMEOUT = 0.5
+REQUEST_TIMEOUT = 500
 FAILOVER_STRATEGIES = ['allow', 'deny', 'challenge', 'throw']
 
 
diff --git a/castle/request.py b/castle/request.py
index 7e38c79..230787c 100644
--- a/castle/request.py
+++ b/castle/request.py
@@ -13,7 +13,7 @@ class Request(object):
             method,
             self.build_url(path),
             auth=('', configuration.api_secret),
-            timeout=configuration.request_timeout,
+            timeout=configuration.request_timeout / 1000.0,
             headers=self.headers,
             verify=Request.verify(),
             data=None if params is None else json.dumps(params)

change timeout configuration from seconds to miliseconds
diff --git a/castle/test/configuration_test.py b/castle/test/configuration_test.py
index 67fd056..6c80f05 100644
--- a/castle/test/configuration_test.py
+++ b/castle/test/configuration_test.py
@@ -15,7 +15,7 @@ class ConfigurationTestCase(unittest.TestCase):
                          HeadersFormatter.call(v) for v in WHITELISTED])
         self.assertEqual(config.blacklisted, [
                          HeadersFormatter.call(v) for v in BLACKLISTED])
-        self.assertEqual(config.request_timeout, 0.5)
+        self.assertEqual(config.request_timeout, 500)
         self.assertEqual(config.failover_strategy, 'allow')
 
     def test_api_secret_setter(self):
@@ -70,8 +70,8 @@ class ConfigurationTestCase(unittest.TestCase):
 
     def test_request_timeout_setter(self):
         config = Configuration()
-        config.request_timeout = 5
-        self.assertEqual(config.request_timeout, 5.0)
+        config.request_timeout = 5000
+        self.assertEqual(config.request_timeout, 5000)
 
     def test_failover_strategy_setter_valid(self):
         config = Configuration()

pip install -e .
parse_log_pytest
pytest
pylint setuptools-lint pep8 autopep8 coverage pytest
3.6
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
astroid==2.11.7
attrs @ file:///opt/conda/conda-bld/attrs_1642510447205/work
autopep8==2.0.4
-e git+https://github.com/castle/castle-python.git@288780af56d67af5757c6b0d17a74a24c29a9a60#egg=castle
certifi==2021.5.30
charset-normalizer==2.0.12
coverage==6.2
dill==0.3.4
idna==3.10
importlib-metadata @ file:///tmp/build/80754af9/importlib-metadata_1631916693255/work
iniconfig @ file:///home/linux1/recipes/ci/iniconfig_1610983019677/work
isort==5.10.1
lazy-object-proxy==1.7.1
mccabe==0.7.0
more-itertools @ file:///tmp/build/80754af9/more-itertools_1637733554872/work
packaging @ file:///tmp/build/80754af9/packaging_1637314298585/work
pep8==1.7.1
platformdirs==2.4.0
pluggy @ file:///tmp/build/80754af9/pluggy_1615976315926/work
py @ file:///opt/conda/conda-bld/py_1644396412707/work
pycodestyle==2.10.0
pylint==2.13.9
pyparsing @ file:///tmp/build/80754af9/pyparsing_1635766073266/work
pytest==6.2.4
requests==2.27.1
setuptools-lint==0.6.0
toml @ file:///tmp/build/80754af9/toml_1616166611790/work
tomli==1.2.3
typed-ast==1.5.5
typing_extensions @ file:///opt/conda/conda-bld/typing_extensions_1647553014482/work
urllib3==1.26.20
wrapt==1.16.0
zipp @ file:///tmp/build/80754af9/zipp_1633618647012/work

name: castle-python
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - attrs=21.4.0=pyhd3eb1b0_0
  - ca-certificates=2025.2.25=h06a4308_0
  - certifi=2021.5.30=py36h06a4308_0
  - importlib-metadata=4.8.1=py36h06a4308_0
  - importlib_metadata=4.8.1=hd3eb1b0_0
  - iniconfig=1.1.1=pyhd3eb1b0_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.3=he6710b0_2
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - more-itertools=8.12.0=pyhd3eb1b0_0
  - ncurses=6.4=h6a678d5_0
  - openssl=1.1.1w=h7f8727e_0
  - packaging=21.3=pyhd3eb1b0_0
  - pip=21.2.2=py36h06a4308_0
  - pluggy=0.13.1=py36h06a4308_0
  - py=1.11.0=pyhd3eb1b0_0
  - pyparsing=3.0.4=pyhd3eb1b0_0
  - pytest=6.2.4=py36h06a4308_2
  - python=3.6.13=h12debd9_1
  - readline=8.2=h5eee18b_0
  - setuptools=58.0.4=py36h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - toml=0.10.2=pyhd3eb1b0_0
  - typing_extensions=4.1.1=pyh06a4308_0
  - wheel=0.37.1=pyhd3eb1b0_0
  - xz=5.6.4=h5eee18b_1
  - zipp=3.6.0=pyhd3eb1b0_0
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - astroid==2.11.7
      - autopep8==2.0.4
      - charset-normalizer==2.0.12
      - coverage==6.2
      - dill==0.3.4
      - idna==3.10
      - isort==5.10.1
      - lazy-object-proxy==1.7.1
      - mccabe==0.7.0
      - pep8==1.7.1
      - platformdirs==2.4.0
      - pycodestyle==2.10.0
      - pylint==2.13.9
      - requests==2.27.1
      - setuptools-lint==0.6.0
      - tomli==1.2.3
      - typed-ast==1.5.5
      - urllib3==1.26.20
      - wrapt==1.16.0
prefix: /opt/conda/envs/castle-python

castle/test/configuration_test.py::ConfigurationTestCase::test_default_values
castle/test/configuration_test.py::ConfigurationTestCase::test_api_secret_setter castle/test/configuration_test.py::ConfigurationTestCase::test_blacklisted_setter_empty castle/test/configuration_test.py::ConfigurationTestCase::test_blacklisted_setter_list castle/test/configuration_test.py::ConfigurationTestCase::test_blacklisted_setter_none castle/test/configuration_test.py::ConfigurationTestCase::test_failover_strategy_setter_invalid castle/test/configuration_test.py::ConfigurationTestCase::test_failover_strategy_setter_valid castle/test/configuration_test.py::ConfigurationTestCase::test_host_setter castle/test/configuration_test.py::ConfigurationTestCase::test_port_setter castle/test/configuration_test.py::ConfigurationTestCase::test_request_timeout_setter castle/test/configuration_test.py::ConfigurationTestCase::test_url_prefix_setter castle/test/configuration_test.py::ConfigurationTestCase::test_whitelisted_setter_empty castle/test/configuration_test.py::ConfigurationTestCase::test_whitelisted_setter_list castle/test/configuration_test.py::ConfigurationTestCase::test_whitelisted_setter_none
README.rst castle/configuration.py HISTORY.md castle/request.py
README.rst castle/configuration.py HISTORY.md castle/request.py