Patch for fixing buffer overflow. After this I'm closing off this branch and renaming it something more appropriate.