diff --git a/MAKE.bat b/MAKE.bat
index 04c5541..2e424f1 100644
--- a/MAKE.bat
+++ b/MAKE.bat
@@ -28,6 +28,7 @@ if "%1"=="help" (
     echo %0 [tidy]                  ; clean up temp files
     echo %0 [bind]                  ; generate lua bindings
     echo %0 [test]                  ; check untracked allocators in V4K
+    echo %0 [todo]                  ; check for @fixme and @todo
     echo %0 [split^|join]            ; engine/v4k* ^>split^> engine/split/* or engine/split/* ^>join^> engine/v4k*
     echo %0 [lua]                   ; execute lua script with v4k
     echo %0 [amalgamation]          ; combine engine/v4k* into a single-header file
@@ -258,6 +259,12 @@ if "%1"=="test" (
     exit /b
 )
 
+if "%1"=="todo" (
+    findstr /RNC:"[^_xv]@todo"  engine\split\v4k*
+    findstr /RNC:"[^_xv]@fixme"  engine\split\v4k*
+    exit /b
+)
+
 if "%1"=="html5" (
     pushd demos\html5
         call make.bat %2
diff --git a/demos/99-crashrpt.c b/demos/99-crashrpt.c
new file mode 100644
index 0000000..2cbc6c8
--- /dev/null
+++ b/demos/99-crashrpt.c
@@ -0,0 +1,12 @@
+#include "v4k.h"
+
+void handle_crash() {
+	alert("crash!");
+}
+
+int main() {
+	trap_install();
+	atexit(handle_crash);
+	app_crash();
+	return 0;
+}
\ No newline at end of file