merge pr #1 from stefan