Updated to compile on Evan's Windows 7 machine for productivity/speed reasons