Closed #105 and #103