Added copyright line
Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from sencheng/master

Merge test