Merge pull request #6 from Rayvexx/Florian

Merge pull request #5 from Rayvexx/master
Merge pull request #7 from Rayvexx/master

Merge pull request #6 from Rayvexx/Florian