Merge pull request #1 from Coronaxe/master

Merging Developer into Master 2 be up to date
Merge pull request #2 from Coronaxe/developer

Merge pull request #1 from Coronaxe/master