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

Tinyfix