Merge pr #40