Merge pull request #34 from shujunqiao/myWork

My work