Modified code

Ported to Github instead of Google Code.