Fixes #86; Fixes #89