Merge pull request #1 from Lawlez/master

pull
Merge pull request #2 from Lawlez/develop

Merge pull request #1 from Lawlez/master