Closed #147 #142 #140 #58