20140529 before Merge
by shirui