change somethings
Merge pull request #2 from losflyer/master

change somethings