Merge pull request #11 from yangqiao/yangqiao

Yangqiao
Merge branch 'yangqiao' into roccajoseph