Revert "Revert "edit by sun on 20140916""

This reverts commit 6ffc7d03bcf75e9af42f31b2816406dbda766c75.