diff --git a/shrc b/shrc
index 4adbd47..1123ff3 100755
--- a/shrc
+++ b/shrc
@@ -340,8 +340,10 @@ then
     if test "$1" = setup
     then
         __mysetup
+        exit 0
     fi
-    exit 0
+    # if this file is sourced return, if executed directly exit
+    return 2>/dev/null || exit
 fi
 
 ######################