Closed #24 Closed #22