Merge pull request #1 from isaiahyoon/master

update
Merge pull request #2 from isaiahyoon/test

Merge pull request #1 from isaiahyoon/master