Committing a slightly modified version of the code from the original Google Code repo