Merge pull request #1 from JuSay/master

Master
Merge pull request #2 from JuSay/develop

Merge pull request #1 from JuSay/master