Fixed #139.
Fixed #138.
Fixed #135.
Fixed #134.