Re-rolled patch #25, fixed cs errors. Please review