diff --git a/scripts/client-check-if-outdated.sh b/scripts/client-check-if-outdated.sh
index 985d3da..ad2791a 100755
--- a/scripts/client-check-if-outdated.sh
+++ b/scripts/client-check-if-outdated.sh
@@ -6,8 +6,8 @@ set -e
 
 git remote update >/dev/null
 
-REMOTE_TS=$(git show --pretty="format:%ct" origin master)
-LOCAL_TS=$(git show --pretty="format:%ct")
+REMOTE_TS=$(git show --pretty="format:%ct" origin/master | head -n1)
+LOCAL_TS=$(git show --pretty="format:%ct" | head -n1)
 
 if [[ ${LOCAL_TS} -lt ${REMOTE_TS} ]]; then
   echo "*** WARNING: You are running outdated Xiringuito version. Remember: 'git pull' FTW!"
diff --git a/xiringuito b/xiringuito
index 7d18f97..7cef435 100755
--- a/xiringuito
+++ b/xiringuito
@@ -39,7 +39,7 @@ fi
 declare -r ORIGINAL_EXEC=${0}
 declare -r ORIGINAL_ARGS=${@}
 
-while getopts "f:RDrh" o; do
+while getopts "f:CRDrh" o; do
   case ${o} in
     f)
       MAX_FAILED_PINGS=${OPTARG}