Merge pull request #1 from chenghm/company

company 20130530
Merge pull request #2 from chenghm/master

merge with company