Fix for issue #3. Thanks to leshus and also nymp...@gmail.com who also found this soludtion on the original eyefiserver project at google code