bear commit
Merge pull request #1 from WinterBear/master

test