some changes
Merge pull request #1 from frostmid/master

some changes