merge pr33 into integration