Fixed #34
Fixed#35
Fixed #36
Fixed #37