Re-rolled patch #38, fixed cs errors. please review.