Resolved #44, Closed #45