Add some changes
Merge pull request #1 from sQuark23/master

Add some changes