Fixed #33, #43, #44