Fixed #4, Fixed #39
Fixed #40 (again)