Merge pull request #1 from Stumble/master

come on!
test merge  2.
Merge remote-tracking branch 'upstream/master'