Added #40 and #41.