updating to #305 branch head