Issue #90 + readme change