Fixed #181
Fixed #188
Fixed #192