diff --git a/prompt.sh b/prompt.sh
index 5385754..cfe5e94 100644
--- a/prompt.sh
+++ b/prompt.sh
@@ -1,35 +1,51 @@
-function find_git_branch {
-   local dir=. head
-   until [ "$dir" -ef / ]; do
-      if [ -f "$dir/.git/HEAD" ]; then
-         head=$(< "$dir/.git/HEAD")
-         if [[ $head == ref:\ refs/heads/* ]]; then
-            git_branch=" (${head#*/*/})"
-         elif [[ $head != '' ]]; then
-            git_branch=' (detached)'
-         else
-            git_branch=' (unknown)'
-         fi
-         return
-      fi
-      dir="../$dir"
-   done
-   git_branch=''
+find_git_branch() {
+   local branch
+   # Based on: http://stackoverflow.com/a/13003854/170413
+   if branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null)
+   then
+   	  if [[ "$branch" == "HEAD" ]]; then
+   	     branch='(detached head)'
+   	  fi
+   	  git_branch="($branch)"
+   else
+      git_branch=""
+   fi
 }
-function find_git_dirty {
-    st=$(git status 2>/dev/null | tail -n 1)
-    if [[ $st == "" ]]; then
-        git_dirty=''
-    elif [[ $st == "nothing to commit (working directory clean)" ]]; then
-        git_dirty=''
-    else
-        git_dirty='*'
-    fi
+
+find_git_dirty() {
+	if [[ -z "$git_branch" ]]
+	then
+		git_dirty=''
+	else
+		# Based on: http://stackoverflow.com/a/2659808/170413
+		local err
+		if err=$(git diff-files --quiet 2>&1)
+		then
+			if git diff-index --quiet --cached HEAD
+			then
+				git_dirty=''
+			else
+				# Can't figure out different colors
+				git_dirty="^"
+			fi
+		elif [ -n "$err" ]
+		then
+			# Some error - most likely that it was run within $GIT_DIR
+			# Resolve repo root instead? `git rev-parse --git-dir` does not work, nor does the 'git root' alias trick
+			git_dirty=""
+		else
+			git_dirty="*"
+		fi
+	fi
 }
+
 PROMPT_COMMAND="find_git_branch; find_git_dirty; $PROMPT_COMMAND"
 
 # Default Git enabled prompt with dirty state
-# export PS1="\u@\h \w\[$txtcyn\]\$git_branch\[$txtylw\]\$git_dirty\[$txtrst\]\$ "
+# export PS1="\u@\h \w\[$txtcyn\]\$git_branch\$git_dirty\[$txtrst\]\$ "
+
+# Another variant:
+# export PS1="\[$bldgrn\]\u@\h\[$txtrst\] \w\[$bldylw\]\$git_branch\[$txtcyn\]\$git_dirty\[$txtrst\]\$ "
 
 # Default Git enabled root prompt (for use with "sudo -s")
-# export SUDO_PS1="\[$bakred\]\u@\h\[$txtrst\] \w\$ "
\ No newline at end of file
+# export SUDO_PS1="\[$bakred\]\u@\h\[$txtrst\] \w\$ "