second pass
Successful\!
Merge pull request #4 from zhaojunbo/master

second pass