Merge pull request #1 from kanaganai/master

Is this it?
person3
person3edit
Merge pull request #2 from iperez6/master

person3