Merge pull request #1 from Vextroid/master

`
Merge pull request #2 from JohnnyFan/master

Merge pull request #2 from Vextroid/master
Merge pull request #3 from Ronald-W/master

Merge pull request #1 from Vextroid/master
Merge pull request #3 from Vextroid/master

0