close #41
fixed #47