#89 dayone

This fixes #89 and #83.