[Close #59]