Merge pull request #1 from shiningjason1989/master

Master
Merge pull request #2 from shiningjason1989/develop

Merge pull request #1 from shiningjason1989/master