Fixed #9
Closed #8