Done #88
Fix #90