diff --git a/PyTracker/trunk/PyTrackerServer.py b/PyTracker/trunk/PyTrackerServer.py
index 3870c6e..6e5bc26 100644
--- a/PyTracker/trunk/PyTrackerServer.py
+++ b/PyTracker/trunk/PyTrackerServer.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 from __future__ import with_statement
 import time
 from socket import *
diff --git a/PyTracker/trunk/clientscriptGUI.py b/PyTracker/trunk/clientscriptGUI.py
index ac5c8a3..b601c14 100644
--- a/PyTracker/trunk/clientscriptGUI.py
+++ b/PyTracker/trunk/clientscriptGUI.py
@@ -4,6 +4,9 @@ import ecore.evas
 import edje
 import sys
 import os
+import atexit
+
+atexit.register(test.StopTrack())
 
 test=TrackClient('anon','passwd','80.61.221.9')