Merge pull request #2 from Paladin1404/develop

Develop
Merge pull request #4 from Paladin1404/develop

Develop
Merge pull request #5 from Paladin1404/master

Merge pull request #2 from Paladin1404/develop