close #27
issue_27 merge