Merge pull request #1 from Naxiz/dev

Merge dev in master
Merge remote-tracking branch 'origin/master'