Make stuff work better
Merge pull request #1 from shiyingzheng/master

Make stuff work better