Close #37 Fixed #44