diff --git a/README.rst b/README.rst
index d6cc499..7dad846 100644
--- a/README.rst
+++ b/README.rst
@@ -44,7 +44,7 @@ To install the package and run StepPy:
 - Install ``python``, ``virtualenv`` and make sure you have a C compiler, portmidi and python headers: e.g. ``sudo apt-get install -y git python3 python3-virtualenv libpython3-dev libportmidi-dev build-essential`` on Debian/Ubuntu
 - Clone this repository and ``cd`` into it
 - Create a ``virtualenv``: ``virtualenv --python=python3 .venv; source .venv/bin/activate``
-- Run ``pip install -e .`` or ``python setup.py develop``
+- Run ``pip install -r requirements.txt`` and ``pip install -e .``
 - Connect a supported controller on an USB port
 - Run ``python -m steppy.main`` or ``python -m steppy.main load examples/mozart.json``
 
diff --git a/requirements.txt b/requirements.txt
index 9c0aca1..59f3268 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,12 @@
 # Main dependencies
-configobj
+git+https://github.com/DiffSK/configobj
 mido
-gevent==1.1b4
+gevent
 pyfiglet
 redis
 flask
 flask-sockets
+gevent-websocket
 
 # Test dependencies
 pytest
diff --git a/setup.py b/setup.py
index 323d8ea..874fd2a 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@
     name='steppy',
     version='0.1.0',
     packages=find_packages(),
-    install_requires=['configobj', 'mido', 'gevent==1.1b4', 'pyfiglet', 'redis', 'flask', 'flask-sockets', 'karellen-geventws', 'six'],
+    install_requires=['configobj', 'mido', 'gevent', 'pyfiglet', 'redis', 'flask', 'flask-sockets', 'gevent-websocket', 'six'],
     extras_require={
         'test': ['pytest', 'tox']
     },
diff --git a/steppy/configurator.py b/steppy/configurator.py
index 98e47f7..9563e63 100644
--- a/steppy/configurator.py
+++ b/steppy/configurator.py
@@ -8,7 +8,7 @@
 import pkg_resources
 
 from configobj import ConfigObj
-from validate import Validator
+from configobj.validate import Validator
 
 
 class Configurator(object):
diff --git a/steppy/server/server.py b/steppy/server/server.py
index aac4e30..cfd5965 100644
--- a/steppy/server/server.py
+++ b/steppy/server/server.py
@@ -10,7 +10,7 @@
 
 from flask import Flask, render_template
 from flask_sockets import Sockets
-from gevent.wsgi import WSGIServer
+from gevent.pywsgi import WSGIServer
 from geventwebsocket.handler import WebSocketHandler