Fixed #35
Fixed #34