Resolved #41 #43 #44