Fixed #67
Closed #65