1.8.7 Update

Fixed #88 and #90