Update. Close #16. Need to confirm #15.