wyx 2014.9.12
merged from wyx