Fixed #73
Closed #72