Kleine fixjes
Merge pull request #1 from kingkorf/master

Kleine fixjes