diff --git a/.gitignore b/.gitignore
index 2d4af4dac..8f87d9945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ target/
 
 # pyenv
 .python-version
+virtualenv
 
 config.json
 preprocessor.py
diff --git a/README.md b/README.md
index 398056079..00dca6e99 100644
--- a/README.md
+++ b/README.md
@@ -74,14 +74,20 @@ Use your favorite AUR helper and install `python-freqtrade-git`.
 
 `develop` branch has often new features, but might also cause breaking changes. To use it, you are encouraged to join our [slack channel](https://join.slack.com/t/highfrequencybot/shared_invite/enQtMjQ5NTM0OTYzMzY3LWMxYzE3M2MxNDdjMGM3ZTYwNzFjMGIwZGRjNTc3ZGU3MGE3NzdmZGMwNmU3NDM5ZTNmM2Y3NjRiNzk4NmM4OGE).
 
-```
-$ cd freqtrade/
-# copy example config. Dont forget to insert your api keys
+```bash
+$ mkdir freqtrade && cd freqtrade/
+# Create an isolated Python virtual environment
+$ pip install virtualenv
+$ virtualenv ./virtualenv --python=$(which python3)
+# Activate the virtualenv
+$ . virtualenv/bin/activate
+# Copy example config. Dont forget to insert your api keys
 $ cp config.json.example config.json
-$ python -m venv .env
-$ source .env/bin/activate
+# Install requirements
 $ pip install -r requirements.txt
+# Install Freqtrade
 $ pip install -e .
+# Run Freqtrade
 $ ./freqtrade/main.py
 ```
 
diff --git a/freqtrade/analyze.py b/freqtrade/analyze.py
index ba57d66c5..3c870e081 100644
--- a/freqtrade/analyze.py
+++ b/freqtrade/analyze.py
@@ -77,14 +77,19 @@ def populate_buy_trend(dataframe: DataFrame) -> DataFrame:
     dataframe.loc[
         (
             (dataframe['rsi'] < 35) &
+            (dataframe['adx'] > 29) &
             (dataframe['fastd'] < 35) &
-            (dataframe['adx'] > 30) &
-            (dataframe['plus_di'] > 0.5)
+            (dataframe['fastd'] > 0) &
+            (dataframe['plus_di'] > 0.1)
         ) |
         (
             (dataframe['adx'] > 65) &
             (dataframe['plus_di'] > 0.5)
         ),
+#	(dataframe['tema'] <= dataframe['blower']) &
+#        (dataframe['rsi'] < 35) &
+#        (dataframe['fastd'] < 48) &
+#        (dataframe['adx'] > 29),
         'buy'] = 1
 
     return dataframe
@@ -97,18 +102,21 @@ def populate_sell_trend(dataframe: DataFrame) -> DataFrame:
     :return: DataFrame with buy column
     """
     dataframe.loc[
-        (
-            (
-                (crossed_above(dataframe['rsi'], 70)) |
-                (crossed_above(dataframe['fastd'], 70))
-            ) &
-            (dataframe['adx'] > 10) &
-            (dataframe['minus_di'] > 0)
-        ) |
-        (
-            (dataframe['adx'] > 70) &
-            (dataframe['minus_di'] > 0.5)
-        ),
+#        (
+#            (
+#                (crossed_above(dataframe['rsi'], 70)) |
+#                (crossed_above(dataframe['fastd'], 80))
+#            ) &
+#            (dataframe['adx'] < 30) &
+#            (dataframe['minus_di'] > 0)
+#        ) |
+#        (
+#            (dataframe['adx'] > 70) &
+#            (dataframe['minus_di'] > 0.5)
+#        ),
+	(crossed_above(dataframe['rsi'], 70))|
+        (crossed_above(dataframe['fastd'], 80)) &
+        (dataframe['adx'] > 31),
         'sell'] = 1
     return dataframe
 
diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py
index e624e96c7..35599b675 100644
--- a/freqtrade/tests/conftest.py
+++ b/freqtrade/tests/conftest.py
@@ -13,17 +13,20 @@ from freqtrade.misc import CONF_SCHEMA
 def default_conf():
     """ Returns validated configuration suitable for most tests """
     configuration = {
-        "max_open_trades": 1,
+        "max_open_trades": 3,
         "stake_currency": "BTC",
-        "stake_amount": 0.05,
+        "stake_amount": 0.004,
         "dry_run": True,
         "minimal_roi": {
-            "40":  0.0,
-            "30":  0.01,
-            "20":  0.02,
-            "0":  0.04
+	"30":  0.0,
+        "25":  0.015,
+        "20":  0.020,
+        "15":  0.025,
+        "10":  0.030,
+        "5":  0.035,
+        "0":  0.045
         },
-        "stoploss": -0.10,
+        "stoploss": -0.03,
         "bid_strategy": {
             "ask_last_balance": 0.0
         },
@@ -32,13 +35,8 @@ def default_conf():
             "enabled": True,
             "key": "key",
             "secret": "secret",
-            "pair_whitelist": [
-                "BTC_ETH",
-                "BTC_TKN",
-                "BTC_TRST",
-                "BTC_SWT",
-                "BTC_BCC"
-            ]
+	"pair_whitelist": ["BTC_EDG", "BTC_ETC", "BTC_MTL", "BTC_OK", "BTC_PAY", "BTC_PIVX", "BTC_SNT", "BTC_XZC", "BTC_VTC", "BTC_XLM", "BTC_SWT",
+        "BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN", "BTC_WAVES"]
         },
         "telegram": {
             "enabled": True,
@@ -56,14 +54,17 @@ def backtest_conf():
     return {
         "max_open_trades": 3,
         "stake_currency": "BTC",
-        "stake_amount": 0.01,
+        "stake_amount": 0.004,
         "minimal_roi": {
-            "40":  0.0,
-            "30":  0.01,
-            "20":  0.02,
-            "0":  0.04
+	"30":  0.0,
+        "25":  0.015,
+        "20":  0.020,
+        "15":  0.025,
+        "10":  0.030,
+        "5":  0.035,
+        "0":  0.045
         },
-        "stoploss": -0.10
+        "stoploss": -0.03
     }
 
 
diff --git a/src/python-bittrex b/src/python-bittrex
new file mode 160000
index 000000000..0373363e1
--- /dev/null
+++ b/src/python-bittrex
@@ -0,0 +1 @@
+Subproject commit 0373363e1a06ac1d4156cca97ff5f02946452a52