Merge pull request #1 from bastienbengler/master

maj
Merge pull request #1 from Skilzen/master

Merge pull request #1 from bastienbengler/master