little fixes
real-little-fixes
Merge pull request #15 from KristofHermans/new-fixes

New fixes