committing weekend updates
Merge remote-tracking branch 'remotes/upstream/master'
Merge pull request #4 from yawenc/master

some updates