some change
Merge pull request #1 from highhat/master

some change