Close #49