Tinyfix
Merge pull request #30 from Agfct/Variousimprovs/fixs

Tinyfix