Merge pull request #106 from leider/master

peinlich...