Implemented #40. Close #40.