minor changes to Rob's patch to compile on windows, fix indent, and include more backward compatibility