Changes alxgnon's broken code for working code, also by him.
Can't you pull before you push on MY branches? Geez!