jianfeng first commit
cleanup
Merge pull request #2 from twairball/jf

Jf