Fixed #34 and #32