Fixed #4
Closed #3