new version from company
Merge branch 'master' of https://github.com/yanweimin7/googleIO2013