Fixed #1
Fixed #4