Merge pull request #3 from chenghm/company

Company
commit at home in 6,4,2014
solve  method security problem