Merge pull request #2 from Garfeild2/master

Fork commit 2
Commit 2
Fork commit 3
Merge commit