jing merge peng's issue_2 with master

issue 2

issue 2