Fixed #18
Fixed #17
Fixed #16