Merge pull request #7 from againcy/update

Update
Merge pull request #6 from againcy/master

Merge pull request #7 from againcy/update