Refixed #29, Fixed #32, #33