Merge pull request #1 from DamTerrion/master

Merge Local
Merge pull request #2 from DamTerrion/Local

Merge pull request #1 from DamTerrion/master