Integrate all#96

Fix #96