Fixed #32 #34
Fixed #30 #31