Merge pull request #1 from dragontest/master

Commit 3
Commit 4
Merge pull request #1 from dragonholiday/master

Update