Fix #37; Fix #43; [#44]: Updates