diff --git a/README.md b/README.md
index 1df7fce..cd4f977 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ theme based on the
 simplicity, showing information only when it's relevant.
 
 It currently shows:
-- Current Python virtualenv
+- Current Python virtualenv; when using Pyenv and no active virtualenv shows the current Python version the shell uses
 - Current Ruby version using Rbenv; version and gemset when on RVM
 - Current Node.js version, through NVM
 - Git status
@@ -136,7 +136,7 @@ or don't want to see. All options must be overridden in your **.zshrc** file.
 |`BULLETTRAIN_CONTEXT_DEFAULT_USER`|none|Default user. If you are running with other user other than default, the segment will be showed.
 |`BULLETTRAIN_IS_SSH_CLIENT`|none|If `true`, the segment will be showed.
 
-### Python virtualenv
+### Python virtualenv (+Pyenv)
 
 |Variable|Default|Meaning
 |--------|-------|-------|
diff --git a/bullet-train.zsh-theme b/bullet-train.zsh-theme
index 81eaa02..a43f9aa 100644
--- a/bullet-train.zsh-theme
+++ b/bullet-train.zsh-theme
@@ -345,10 +345,10 @@ prompt_ruby() {
   if which rvm-prompt &> /dev/null; then
     if [[ ! -n $(rvm gemset list | grep "=> (default)") ]]
     then
-      prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX"  $(rvm-prompt i v g)"
+      prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rvm-prompt i v g)"
     fi
   elif which rbenv &> /dev/null; then
-    prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX"  $(rbenv version | sed -e 's/ (set.*$//')"
+    prompt_segment $BULLETTRAIN_RUBY_BG $BULLETTRAIN_RUBY_FG $BULLETTRAIN_RUBY_PREFIX" $(rbenv version | sed -e 's/ (set.*$//')"
   fi
 }
 
@@ -360,7 +360,9 @@ prompt_virtualenv() {
 
   local virtualenv_path="$VIRTUAL_ENV"
   if [[ -n $virtualenv_path && -n $VIRTUAL_ENV_DISABLE_PROMPT ]]; then
-    prompt_segment $BULLETTRAIN_VIRTUALENV_BG $BULLETTRAIN_VIRTUALENV_FG $BULLETTRAIN_VIRTUALENV_PREFIX"  $(basename $virtualenv_path)"
+    prompt_segment $BULLETTRAIN_VIRTUALENV_BG $BULLETTRAIN_VIRTUALENV_FG $BULLETTRAIN_VIRTUALENV_PREFIX" $(basename $virtualenv_path)"
+  elif which pyenv &> /dev/null; then
+    prompt_segment $BULLETTRAIN_VIRTUALENV_BG $BULLETTRAIN_VIRTUALENV_FG $BULLETTRAIN_VIRTUALENV_PREFIX" $(pyenv version | sed -e 's/ (set.*$//')"
   fi
 }