merge pr45 into integration