first commit in master-patch2
second commit in master-patch2
Merge pull request #2 from bonbon0605/master-patch2

Master patch2