diff --git a/testitradar b/testitradar
index 5e00848..418ccd6 100755
--- a/testitradar
+++ b/testitradar
@@ -1,4 +1,13 @@
 #!/bin/bash
 
+CMD="./build/default/src/icfp08radar localhost 17676"
+
 ./waf distclean && ./waf configure && ./waf build --targets icfp08radar
-./build/default/src/icfp08radar localhost 17676
+
+if [ "$1" == "--gdb" ]; then 
+	CMD="gdb --args ${CMD}"
+elif [ "$1" == "--valgrind" ]; then
+	CMD="valgrind --args ${CMD}"
+fi
+
+exec $CMD