merge pr #41