Merge pull request #1 from DamTerrion/master

Merge Local