Merge pull request #4 from kiddkai/master

upmerge
flex style
upmerge
Merge pull request #4 from LeiZeng/master

flex style