diff --git a/.travis.yml b/.travis.yml
index 7d4d41f38a44ae9dbf2aa6ede267d1c8ba79545a..2832a20208dfcfdc69d706ac0663cdce24ebdb2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ before_install:
   # Set numpy version first, other packages link against it
   - pip install six nose coverage codecov pytest pytest-cov coveralls codacy-coverage parameterized secp256k1prp cryptography scrypt
   - pip install pycryptodomex  pyyaml appdirs pylibscrypt tox
-  - pip install ecdsa requests future websocket-client pytz six Click events prettytable
+  - pip install ecdsa requests future websocket-client pytz six Click events prettytable click_shell
 
 script:
  - tox
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 00ed650918049e8f0b687d73ee65ce1850cc166a..5f3b6a485f4d2691fba55299a76435fb67266a71 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,5 +1,10 @@
 Changelog
 =========
+0.22.14
+-------
+* add click_shell to turn beempy into a shell utility with autocompletion
+* new click_shell added as requirements
+
 0.22.13
 -------
 * HiveSigner support added
diff --git a/appveyor.yml b/appveyor.yml
index 492191368c937fd8f3a0ddeeb7b47777f25f669c..6058f3ec6f404051e08f8db84a9d5cbe4841b2f7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -50,7 +50,7 @@ install:
 - cmd: conda install --yes conda-build setuptools pip parameterized cryptography
 - cmd: conda install --yes pycryptodomex pyyaml pytest pytest-mock coverage mock appdirs pylibscrypt
 - cmd: pip install scrypt -U
-- cmd: conda install --yes ecdsa requests future websocket-client pytz six Click events prettytable pyinstaller
+- cmd: conda install --yes ecdsa requests future websocket-client pytz six Click events prettytable pyinstaller click_shell
 
 
 build_script:
diff --git a/beem/cli.py b/beem/cli.py
index 2a3109ce646477ba79ff6698f1448b2d4ba5dc9b..40582d138b65bff7c2e181b2ef7a0061d95139ae 100644
--- a/beem/cli.py
+++ b/beem/cli.py
@@ -17,6 +17,7 @@ import math
 import random
 import logging
 import click
+from click_shell import shell
 import yaml
 import re
 from beem.instance import set_shared_steem_instance, shared_steem_instance
@@ -152,8 +153,8 @@ def node_answer_time(node):
         rpc_answer_time = float("inf")
     return rpc_answer_time
 
-
-@click.group(chain=True)
+@shell(prompt='beempy> ', intro='Starting beempy... (use help to list all commands)', chain=True)
+# @click.group(chain=True)
 @click.option(
     '--node', '-n', default="", help="URL for public Steem API (e.g. https://api.steemit.com)")
 @click.option(
diff --git a/beem/imageuploader.py b/beem/imageuploader.py
index ba7cc08bd9b0133ea831d52b60a5e91360ef4a97..c80122eb286416766960fec22adcfdc2ff6109db 100644
--- a/beem/imageuploader.py
+++ b/beem/imageuploader.py
@@ -28,7 +28,7 @@ class ImageUploader(object):
         self.base_url = base_url
         self.steem = steem_instance or shared_steem_instance()
         if self.steem.is_hive and base_url == "https://steemitimages.com":
-            base_url = "https://images.hive.blog"
+            self.base_url = "https://images.hive.blog"
 
     def upload(self, image, account, image_name=None):
         """ Uploads an image
diff --git a/beem/version.py b/beem/version.py
index 798f229e27f48637856a12a8688f4daa6116ccdc..b8bc9d9c101ead1120304a7a90ac49ab52209375 100644
--- a/beem/version.py
+++ b/beem/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.22.13'
+version = '0.22.14'
diff --git a/beemapi/version.py b/beemapi/version.py
index 798f229e27f48637856a12a8688f4daa6116ccdc..b8bc9d9c101ead1120304a7a90ac49ab52209375 100644
--- a/beemapi/version.py
+++ b/beemapi/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.22.13'
+version = '0.22.14'
diff --git a/beembase/version.py b/beembase/version.py
index 798f229e27f48637856a12a8688f4daa6116ccdc..b8bc9d9c101ead1120304a7a90ac49ab52209375 100644
--- a/beembase/version.py
+++ b/beembase/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.22.13'
+version = '0.22.14'
diff --git a/beemgraphenebase/version.py b/beemgraphenebase/version.py
index 798f229e27f48637856a12a8688f4daa6116ccdc..b8bc9d9c101ead1120304a7a90ac49ab52209375 100644
--- a/beemgraphenebase/version.py
+++ b/beemgraphenebase/version.py
@@ -1,2 +1,2 @@
 """THIS FILE IS GENERATED FROM beem SETUP.PY."""
-version = '0.22.13'
+version = '0.22.14'
diff --git a/requirements-test.txt b/requirements-test.txt
index 6ebf8bda2fa38b15f851572a4451ed413651c91f..e6a98772e01dd82afc5159736bf0d3e564aa6ccd 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -14,6 +14,7 @@ pyyaml>=4.2b1
 mock==4.0.2
 appdirs==1.4.3
 Click==7.1.1
+click_shell>=2.0
 prettytable
 pycodestyle==2.5.0
 pyflakes==2.1.1
diff --git a/setup.py b/setup.py
index 6906ca2ba8981a8d9b99110625f46205206f785f..3b1679cbc4e83008be74ba27863569584f1f9975 100755
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ except LookupError:
     ascii = codecs.lookup('ascii')
     codecs.register(lambda name, enc=ascii: {True: enc}.get(name == 'mbcs'))
 
-VERSION = '0.22.13'
+VERSION = '0.22.14'
 
 tests_require = ['mock >= 2.0.0', 'pytest', 'pytest-mock', 'parameterized']
 
@@ -32,6 +32,7 @@ requires = [
     "pycryptodomex",
     "pytz",
     "Click",
+    "click_shell",
     "prettytable",
     "pyyaml"
 ]