Improvements thanks to Lukas_
Merge pull request #348 from Vexatos/patch-1

Improvements thanks to Lukas_