changed some things
Merge pull request #1 from Yord/master

changed some things