Merge pull request #56 from yushan87/master

My Changes