Merge pull request #1 from pengzang/master

issue1
Initial commit
commit 1
merge jing master with local repo
issue3 from peng
Merge branch 'issue_3' of github.com:pengzang/exp1 into issue_3