diff --git a/README.md b/README.md
index e5347ba..de76a05 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,7 @@ set -g theme_title_use_abbreviated_path no
 set -g theme_date_format "+%a %H:%M"
 set -g theme_avoid_ambiguous_glyphs yes
 set -g theme_nerd_fonts yes
+set -g theme_show_exit_status yes
 set -g default_user your_normal_user
 ```
 
@@ -88,6 +89,7 @@ set -g default_user your_normal_user
 **Prompt options**
 - `theme_display_ruby`. Use `no` to completely hide all information about Ruby version. By default Ruby version displayed if there is the difference from default settings.
 - `theme_display_vagrant`. This feature is disabled by default, use `yes` to display Vagrant status in your prompt. Please note that only the VirtualBox and VMWare providers are supported.
+- `theme_show_exit_status`. Set this option to yes to have the prompt show the last exit code if it was non_zero instead of just the exclamation mark.
 
 [fish]:       https://github.com/fish-shell/fish-shell
 [screenshot]: http://i.0x7f.us/bobthefish.png
diff --git a/fish_prompt.fish b/fish_prompt.fish
index 7e49847..da3ef1d 100644
--- a/fish_prompt.fish
+++ b/fish_prompt.fish
@@ -29,6 +29,7 @@
 #     set -g theme_display_vi_hide_mode default
 #     set -g theme_avoid_ambiguous_glyphs yes
 #     set -g theme_nerd_fonts yes
+#     set -g theme_show_exit_status yes
 #     set -g default_user your_normal_user
 
 # ===========================
@@ -269,7 +270,11 @@ function __bobthefish_prompt_status -S -a last_status -d 'Display symbols for a
     __bobthefish_start_segment fff 000
     if [ "$nonzero" ]
       set_color $__bobthefish_med_red --bold
-      echo -n $__bobthefish_nonzero_exit_glyph
+      if [ "$theme_show_exit_status" = 'yes' ]
+      	echo -n $last_status' '
+      else
+      	echo -n $__bobthefish_nonzero_exit_glyph
+      end
     end
 
     if [ "$superuser" ]