Merge pull request #4 from jyzhou831/master

from gary
luis' 1st commit
Merge pull request #5 from florelui001/master

luis' 1st commit
Merge pull request #2 from akhotan10/master

update