Merge pull request #22 from robert-scheck/wollen-moechten